Merge branch 'dmishunov-scoped-feature-flag' into 'master'

Updated the project_sidebar_refactor flag

See merge request gitlab-org/gitlab!60112

config/feature_flags/development/project_sidebar_refactor.yml → config/feature_flags/development/sidebar_refactor.yml

 ---
-name: project_sidebar_refactor
+name: sidebar_refactor
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58638
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326111
 milestone: '13.11'

ee/app/views/layouts/nav/_requirements_link.html.haml

 - return unless project_nav_tab? :requirements
+- refactoring_enabled = Feature.enabled?(:sidebar_refactor, current_user)
 
 = nav_link(path: 'requirements#index') do
   = link_to project_requirements_management_requirements_path(project), class: 'qa-project-requirements-link' do
@@ -6,12 +7,13 @@
       = sprite_icon('requirements')
     %span.nav-item-name
       = _('Requirements')
-  - if Feature.disabled?(:project_sidebar_refactor)
-    %ul.sidebar-sub-level-items
-      = nav_link(path: 'requirements#index', html_options: { class: "fly-out-top-item" } ) do
-        = link_to project_requirements_management_requirements_path(project) do
-          %strong.fly-out-top-item-name= _('Requirements')
+  %ul.sidebar-sub-level-items{ class: ('is-fly-out-only' if refactoring_enabled) }
+    = nav_link(path: 'requirements#index', html_options: { class: "fly-out-top-item" } ) do
+      = link_to project_requirements_management_requirements_path(project) do
+        %strong.fly-out-top-item-name= _('Requirements')
+    - if !refactoring_enabled
       %li.divider.fly-out-top-item
       = nav_link(path: 'requirements#index', html_options: { class: 'home' }) do
         = link_to project_requirements_management_requirements_path(project), title: 'List' do
           %span= _('List')
+- refactoring_enabled = Feature.enabled?(:sidebar_refactor, current_user)

ee/spec/features/projects/navbar_spec.rb

@@ -85,7 +85,7 @@ RSpec.describe 'Project navbar' do
 
     context 'with flag enabled' do
       before do
-        stub_feature_flags(project_sidebar_refactor: true)
+        stub_feature_flags(sidebar_refactor: true)
 
         insert_after_nav_item(
           _('Merge requests'),
@@ -103,7 +103,7 @@ RSpec.describe 'Project navbar' do
 
     context 'with flag disabled' do
       before do
-        stub_feature_flags(project_sidebar_refactor: false)
+        stub_feature_flags(sidebar_refactor: false)
 
         insert_after_nav_item(
           _('Merge requests'),