summaryrefslogtreecommitdiff
path: root/app/views/layouts/application.html.haml
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-06-16 11:31:39 +0100
committerPhil Hughes <me@iamphill.com>2017-06-21 14:45:23 +0100
commitc5f25f6550a3563507e39b1e5eea5df84a8bba2f (patch)
tree09d80b24319559919470f0db51c36f79019b0c8d /app/views/layouts/application.html.haml
parent78ee24ba53a4a44d829613495ec0d5f1bbb5a9ee (diff)
downloadgitlab-ce-c5f25f6550a3563507e39b1e5eea5df84a8bba2f.tar.gz
Top navigation redesign
Start of the new navigation by redesigning just the top navigation menu. This is only shown when a cookie is set. Part of #32794
Diffstat (limited to 'app/views/layouts/application.html.haml')
-rw-r--r--app/views/layouts/application.html.haml5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 2b07273a0a8..d879df8fc82 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -4,7 +4,10 @@
%body{ class: @body_class, data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}" } }
= render "layouts/init_auto_complete" if @gfm_form
= render 'peek/bar'
- = render "layouts/header/default", title: header_title
+ - if show_new_nav?
+ = render "layouts/header/new"
+ - else
+ = render "layouts/header/default", title: header_title
= render 'layouts/page', sidebar: sidebar, nav: nav
= yield :scripts_body