Fatih Acet fe125f8dc9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown ...

# Conflicts:
#	app/assets/javascripts/lib/common_utils.js.coffee

2016-06-16 02:04:09 +03:00

..

ci

Revert side nav to full width; remove border under nav; remove tooltips on nav links; stop page content shifting with side nav; put project nav in container

2016-06-10 12:01:51 -05:00

header

Pinned sidebar navigation option

2016-06-15 17:23:49 +01:00

nav

Rearrange order of tabs

2016-06-15 09:54:38 -05:00

_bootlint.haml

Bootlint integration

2015-04-01 21:33:22 +02:00

_broadcast.html.haml

Update broadcast_message helper

2016-01-13 11:34:58 -05:00

_collapse_button.html.haml

Moved pinned button to the bottom

2016-06-15 19:35:37 +01:00

_flash.html.haml

hide no-ssh message if notice or alert present

2013-08-10 21:20:03 +03:00

_google_analytics.html.haml

Fix google analytics setting being ignored

2013-05-24 23:17:07 +03:00

_head.html.haml

Render gon data in the page body, not head

2016-06-06 12:50:31 +05:30

_init_auto_complete.html.haml

Only load autocomplete data when actually needed

2016-01-11 11:13:11 +01:00

_page_title.html.haml

Replace page_title with page-title. Correct margin for some blocks/layouts

2013-07-13 08:45:48 +03:00

_page.html.haml

Moved pinned button to the bottom

2016-06-15 19:35:37 +01:00

_piwik.html.haml

Update piwik template

2015-11-08 18:03:30 +02:00

_search.html.haml

Escape JavaScript in haml template.

2016-06-14 00:07:18 +03:00

_user_styles.html.haml

Use display: inline where appropriate

2015-08-06 14:55:03 +02:00

admin.html.haml

Move admin nav to horizontal layout nav

2016-06-15 09:10:16 -05:00

application.html.haml

Inject group options.

2016-06-09 04:21:35 +03:00

dashboard.html.haml

Move project header title definition to view in question.

2015-09-17 12:16:24 +02:00

devise_empty.html.haml

Render gon data in the page body, not head

2016-06-06 12:50:31 +05:30

devise_mailer.html.haml

New confirmation email 🔥

2016-05-25 16:56:06 -04:00

devise.html.haml

Render gon data in the page body, not head

2016-06-06 12:50:31 +05:30

errors.html.haml

Render gon data in the page body, not head

2016-06-06 12:50:31 +05:30

explore.html.haml

Clean up overlap between dashboard and explore.

2015-09-08 14:49:20 +01:00

group_settings.html.haml

Dont specify sidebar for group and group settings layouts

2016-05-03 12:31:50 +02:00

group.html.haml

Dont specify sidebar for group and group settings layouts

2016-05-03 12:31:50 +02:00

help.html.haml

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

notify.html.haml

Syntax-highlight diffs in push emails

2016-05-17 13:23:17 +01:00

profile.html.haml

Implement top navigation concept for profile area

2016-04-19 20:05:30 +02:00

project_settings.html.haml

Implement new horizontal navigation to project pages

2016-05-16 12:21:12 -05:00

project.html.haml

Hook up the updated WikiLinkFilter to the wiki controllers.

2016-06-09 10:15:01 +05:30

search.html.haml

Add helpers for header title and sidebar, and move setting those from controllers to layouts.

2015-05-01 10:39:16 +02:00

snippets.html.haml

Clean up overlap between dashboard and explore.

2015-09-08 14:49:20 +01:00