From cd10655f53367c76be1e6088019765edcd959906 Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Fri, 9 Nov 2018 14:17:00 +0200
Subject: Show navigation line separator when instance metrics is disabled

---
 app/helpers/nav_helper.rb                  | 16 ++++++++++++----
 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)
-- 
cgit v1.2.1