diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-12 17:50:27 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-12 17:50:27 +0000 |
| commit | 2c9894d457cac2f15331081a4f6974e0803fead3 (patch) | |
| tree | 4c5d4c344b963baca94657a0a7bd4616c2d2251c /app/views | |
| parent | 6f4b4fd901d854cf6d06dcdd91d98d0512a9ec39 (diff) | |
| parent | 1ac6bdb5c85f14557ed41b5b81d6ee9d577739a1 (diff) | |
| download | gitlab-ce-2c9894d457cac2f15331081a4f6974e0803fead3.tar.gz | |
Merge branch 'project-title-dropdown' into 'master'
Project dropdown in header uses new dropdown
See merge request !3339
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/project.html.haml | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 0f3b8119379..44339293095 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -45,6 +45,8 @@ %h1.title= title + = yield :header_content + = render 'shared/outdated_browser' - if @project && !@project.empty_repo? diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index a7ef31acd3d..6dfe7fbdae8 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -17,4 +17,12 @@ - content_for :scripts_body do = render "layouts/init_auto_complete" if current_user +- content_for :header_content do + .js-dropdown-menu-projects + .dropdown-menu.dropdown-select.dropdown-menu-projects + = dropdown_title("Go to a project") + = dropdown_filter("Search your projects") + = dropdown_content + = dropdown_loading + = render template: "layouts/application" |