diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-15 11:13:56 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-15 11:13:56 +0000 |
| commit | 682e1d093149b25eef8cd670a7d7ca3ccee834f2 (patch) | |
| tree | 78fb478cd1359ac111b3632e427ec6afa03aff34 /app/views/layouts/header | |
| parent | 9d5afa1ca247e6fdfa1ee201ea9d0ef3bbdebce1 (diff) | |
| parent | 974e71a9c51b6f2d4ef2fb8ba9a538ced4106480 (diff) | |
| download | gitlab-ce-682e1d093149b25eef8cd670a7d7ca3ccee834f2.tar.gz | |
Merge branch 'layouts-scb' into 'master'
Resolve CE/EE diffs in app/views/layouts view
Closes gitlab-ee#6647
See merge request gitlab-org/gitlab-ce!28197
Diffstat (limited to 'app/views/layouts/header')
| -rw-r--r-- | app/views/layouts/header/_help_dropdown.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/layouts/header/_help_dropdown.html.haml b/app/views/layouts/header/_help_dropdown.html.haml index fbec62b02f8..5643a508ddc 100644 --- a/app/views/layouts/header/_help_dropdown.html.haml +++ b/app/views/layouts/header/_help_dropdown.html.haml @@ -8,6 +8,7 @@ = link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback" - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile) = render 'shared/user_dropdown_contributing_link' + = render_if_exists 'shared/user_dropdown_instance_review' - if Gitlab.com? %li.js-canary-link = link_to _("Switch to GitLab Next"), "https://next.gitlab.com/" |