1 files changed, 10 insertions, 2 deletions
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index db144f63f92..aab1a44bdfb 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -12,6 +12,7 @@ module NavHelper
   def page_with_sidebar_class
     class_name = page_gutter_class
     class_name << 'page-with-contextual-sidebar' if defined?(@left_sidebar) && @left_sidebar
+    class_name << 'sidebar-refactoring' if Feature.enabled?(:sidebar_refactor, current_user)
     class_name << 'page-with-icon-sidebar' if collapsed_sidebar? && @left_sidebar
     class_name -= ['right-sidebar-expanded'] if defined?(@right_sidebar) && !@right_sidebar
 
@@ -68,7 +69,14 @@ module NavHelper
   end
 
   def group_issues_sub_menu_items
-    %w(groups#issues labels#index milestones#index boards#index boards#show)
+    %w[
+      groups#issues
+      milestones#index
+      boards#index
+      boards#show
+    ].tap do |paths|
+      paths << 'labels#index' if Feature.disabled?(:sidebar_refactor, current_user, default_enabled: :yaml)
+    end
   end
 
   private
@@ -100,4 +108,4 @@ module NavHelper
   end
 end
 
-NavHelper.prepend_if_ee('EE::NavHelper')
+NavHelper.prepend_mod_with('NavHelper')