Merge branch '324086-feature-flag-enable-combined-menu-for-top-nav' into 'master'

[Feature flag] Add :combined_menu feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!56249

app/views/layouts/header/_default.html.haml

@@ -19,10 +19,13 @@
               %span.gl-badge.gl-bg-green-500.gl-text-white.gl-rounded-pill.gl-font-weight-bold.gl-py-1
                 = _('Next')
 
-        - if current_user
-          = render "layouts/nav/dashboard"
+        - if Feature.enabled?(:combined_menu, current_user, default_enabled: :yaml)
+          = render "layouts/nav/combined_menu"
         - else
-          = render "layouts/nav/explore"
+          - if current_user
+            = render "layouts/nav/dashboard"
+          - else
+            = render "layouts/nav/explore"
 
       .navbar-collapse.collapse
         %ul.nav.navbar-nav

app/views/layouts/nav/_combined_menu.html.haml

+%button{ type: 'button', data: { toggle: "dropdown" } }
+  = sprite_icon('ellipsis_v')
+  = _('Projects')

config/feature_flags/development/combined_menu.yml

+---
+name: combined_menu
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56249
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321904
+milestone: '13.10'
+type: development
+group: group::editor
+default_enabled: false

ee/spec/features/operations_nav_link_spec.rb

@@ -7,6 +7,8 @@ RSpec.describe 'Operations dropdown navbar EE' do
   let(:project) { create(:project) }
 
   before do
+    stub_feature_flags(combined_menu: false)
+
     project.add_maintainer(user)
     sign_in(user)
 

spec/features/admin/admin_mode/logout_spec.rb

@@ -9,6 +9,8 @@ RSpec.describe 'Admin Mode Logout', :js do
   let(:user) { create(:admin) }
 
   before do
+    stub_feature_flags(combined_menu: false)
+
     gitlab_sign_in(user)
     gitlab_enable_admin_mode_sign_in(user)
     visit admin_root_path

spec/features/admin/admin_mode_spec.rb

@@ -9,6 +9,8 @@ RSpec.describe 'Admin mode' do
   let(:admin) { create(:admin) }
 
   before do
+    stub_feature_flags(combined_menu: false)
+
     stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
   end
 

spec/features/dashboard/active_tab_spec.rb

@@ -4,6 +4,8 @@ require 'spec_helper'
 
 RSpec.describe 'Dashboard Active Tab', :js do
   before do
+    stub_feature_flags(combined_menu: false)
+
     sign_in(create(:user))
   end
 

spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb

@@ -8,6 +8,8 @@ RSpec.describe 'The group dashboard' do
   let(:user) { create(:user) }
 
   before do
+    stub_feature_flags(combined_menu: false)
+
     sign_in user
   end
 

spec/features/dashboard/shortcuts_spec.rb

@@ -3,6 +3,10 @@
 require 'spec_helper'
 
 RSpec.describe 'Dashboard shortcuts', :js do
+  before do
+    stub_feature_flags(combined_menu: false)
+  end
+
   context 'logged in' do
     let(:user) { create(:user) }
     let(:project) { create(:project) }

spec/features/frequently_visited_projects_and_groups_spec.rb

@@ -6,6 +6,8 @@ RSpec.describe 'Frequently visited items', :js do
   let_it_be(:user) { create(:user) }
 
   before do
+    stub_feature_flags(combined_menu: false)
+
     sign_in(user)
   end