Phil Hughes a8bc8d4d39 Merge branch 'sidebar-header-no-conflicts' into 'master' ... Sidebar header no conflicts See merge request !12524		2017-06-29 13:37:10 +00:00
..
_admin.html.haml	Add Conversational Development Index page to admin panel	2017-06-01 17:37:21 +02:00
_admin_settings.html.haml	HAMLLint: Fix SpaceInsideHashAttributes offences	2016-12-31 11:58:36 +05:30
_dashboard.html.haml	Remove helpers assigned_issuables_count and cached_assigned_issuables_count	2017-04-20 13:28:04 +03:00
_explore.html.haml	Added keyboard shortcuts to signed out menu	2017-04-10 12:20:25 +01:00
_group.html.haml	Changed "Edit Group" subtab to "General" and moved it	2017-03-15 10:18:07 -06:00
_new_admin_sidebar.html.haml	Minor edits	2017-06-29 07:05:07 -05:00
_new_dashboard.html.haml	fixed dashboard projects nav item being active	2017-06-21 14:45:23 +01:00
_new_explore.html.haml	added signed out subnav	2017-06-21 14:45:23 +01:00
_new_group_sidebar.html.haml	Minor edits	2017-06-29 07:05:07 -05:00
_new_profile_sidebar.html.haml	Make header into links; CSS tweaks	2017-06-28 09:59:29 -05:00
_new_project_sidebar.html.haml	Make header into links; CSS tweaks	2017-06-28 09:59:29 -05:00
_profile.html.haml	Rename Personal Audit Log	2017-05-16 12:54:57 +00:00
_project.html.haml	Split up MergeRequestsController	2017-06-28 18:17:44 -05:00