Commit d6a73052 authored by Denys Mishunov's avatar Denys Mishunov

Updated the project_sidebar_refactor flag

- Renamed the flag to sidebar_refactor to reflect the
wider scope of the flag's action
- Scoped the flag to the user
parent 7adf65f7
--- ---
name: project_sidebar_refactor name: sidebar_refactor
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58638 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58638
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326111 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326111
milestone: '13.11' milestone: '13.11'
......
- return unless project_nav_tab? :requirements - return unless project_nav_tab? :requirements
- refactoring_enabled = Feature.enabled?(:sidebar_refactor, current_user)
= nav_link(path: 'requirements#index') do = nav_link(path: 'requirements#index') do
= link_to project_requirements_management_requirements_path(project), class: 'qa-project-requirements-link' do = link_to project_requirements_management_requirements_path(project), class: 'qa-project-requirements-link' do
...@@ -6,12 +7,13 @@ ...@@ -6,12 +7,13 @@
= sprite_icon('requirements') = sprite_icon('requirements')
%span.nav-item-name %span.nav-item-name
= _('Requirements') = _('Requirements')
- if Feature.disabled?(:project_sidebar_refactor) %ul.sidebar-sub-level-items{ class: ('is-fly-out-only' if refactoring_enabled) }
%ul.sidebar-sub-level-items = nav_link(path: 'requirements#index', html_options: { class: "fly-out-top-item" } ) do
= nav_link(path: 'requirements#index', html_options: { class: "fly-out-top-item" } ) do = link_to project_requirements_management_requirements_path(project) do
= link_to project_requirements_management_requirements_path(project) do %strong.fly-out-top-item-name= _('Requirements')
%strong.fly-out-top-item-name= _('Requirements') - if !refactoring_enabled
%li.divider.fly-out-top-item %li.divider.fly-out-top-item
= nav_link(path: 'requirements#index', html_options: { class: 'home' }) do = nav_link(path: 'requirements#index', html_options: { class: 'home' }) do
= link_to project_requirements_management_requirements_path(project), title: 'List' do = link_to project_requirements_management_requirements_path(project), title: 'List' do
%span= _('List') %span= _('List')
- refactoring_enabled = Feature.enabled?(:sidebar_refactor, current_user)
...@@ -85,7 +85,7 @@ RSpec.describe 'Project navbar' do ...@@ -85,7 +85,7 @@ RSpec.describe 'Project navbar' do
context 'with flag enabled' do context 'with flag enabled' do
before do before do
stub_feature_flags(project_sidebar_refactor: true) stub_feature_flags(sidebar_refactor: true)
insert_after_nav_item( insert_after_nav_item(
_('Merge requests'), _('Merge requests'),
...@@ -103,7 +103,7 @@ RSpec.describe 'Project navbar' do ...@@ -103,7 +103,7 @@ RSpec.describe 'Project navbar' do
context 'with flag disabled' do context 'with flag disabled' do
before do before do
stub_feature_flags(project_sidebar_refactor: false) stub_feature_flags(sidebar_refactor: false)
insert_after_nav_item( insert_after_nav_item(
_('Merge requests'), _('Merge requests'),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment