diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-11-14 14:39:15 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-11-14 14:39:15 +0000 |
| commit | ea31f56e1d770bd546d5d94dfa87dba5d3aaea48 (patch) | |
| tree | c3a3524f9ab1611f9419b2e763f021a2f92ddf40 | |
| parent | 24e5599748d98f34dc4f534eebc79a1bd9f0ddf9 (diff) | |
| parent | cd10655f53367c76be1e6088019765edcd959906 (diff) | |
| download | gitlab-ce-ea31f56e1d770bd546d5d94dfa87dba5d3aaea48.tar.gz | |
Merge branch 'gt-show-navigation-line-separator-ce' into 'master'
Show navigation line separator when instance metrics is disabled
See merge request gitlab-org/gitlab-ce!22940
| -rw-r--r-- | app/helpers/nav_helper.rb | 16 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index 761f42f2f0f..a7fe8c3d59c 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -19,10 +19,7 @@ module NavHelper end def page_gutter_class - if current_path?('merge_requests#show') || - current_path?('projects/merge_requests/conflicts#show') || - current_path?('issues#show') || - current_path?('milestones#show') + if page_has_markdown? if cookies[:collapsed_gutter] == 'true' %w[page-gutter right-sidebar-collapsed] @@ -50,6 +47,17 @@ module NavHelper class_names end + def show_separator? + Gitlab::Sherlock.enabled? || can?(current_user, :read_instance_statistics) + end + + def page_has_markdown? + current_path?('merge_requests#show') || + current_path?('projects/merge_requests/conflicts#show') || + current_path?('issues#show') || + current_path?('milestones#show') + end + private def get_header_links diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 8f8b6b454d9..ea5f2b166b4 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -64,7 +64,7 @@ = link_to '#', class: 'dashboard-shortcuts-web-ide', title: _('Web IDE') do = _('Web IDE') - - if Gitlab::Sherlock.enabled? || can?(current_user, :read_instance_statistics) + - if show_separator? %li.line-separator.d-none.d-sm-block = render_if_exists 'dashboard/operations/nav_link' - if can?(current_user, :read_instance_statistics) |