Commit 3a6952c2 authored by Shinya Maeda's avatar Shinya Maeda

Merge branch 'id-code-nav-feature-flag' into 'master'

Enable code_navigation for feature specs

See merge request gitlab-org/gitlab!35309
parents 198db5db 15c2fc8e
...@@ -30,7 +30,7 @@ class Projects::BlobController < Projects::ApplicationController ...@@ -30,7 +30,7 @@ class Projects::BlobController < Projects::ApplicationController
before_action :set_last_commit_sha, only: [:edit, :update] before_action :set_last_commit_sha, only: [:edit, :update]
before_action only: :show do before_action only: :show do
push_frontend_feature_flag(:code_navigation, @project) push_frontend_feature_flag(:code_navigation, @project, default_enabled: true)
push_frontend_feature_flag(:suggest_pipeline) if experiment_enabled?(:suggest_pipeline) push_frontend_feature_flag(:suggest_pipeline) if experiment_enabled?(:suggest_pipeline)
end end
......
...@@ -29,7 +29,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo ...@@ -29,7 +29,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
push_frontend_feature_flag(:deploy_from_footer, @project, default_enabled: true) push_frontend_feature_flag(:deploy_from_footer, @project, default_enabled: true)
push_frontend_feature_flag(:single_mr_diff_view, @project, default_enabled: true) push_frontend_feature_flag(:single_mr_diff_view, @project, default_enabled: true)
push_frontend_feature_flag(:suggest_pipeline) if experiment_enabled?(:suggest_pipeline) push_frontend_feature_flag(:suggest_pipeline) if experiment_enabled?(:suggest_pipeline)
push_frontend_feature_flag(:code_navigation, @project) push_frontend_feature_flag(:code_navigation, @project, default_enabled: true)
push_frontend_feature_flag(:widget_visibility_polling, @project, default_enabled: true) push_frontend_feature_flag(:widget_visibility_polling, @project, default_enabled: true)
push_frontend_feature_flag(:merge_ref_head_comments, @project) push_frontend_feature_flag(:merge_ref_head_comments, @project)
push_frontend_feature_flag(:mr_commit_neighbor_nav, @project, default_enabled: true) push_frontend_feature_flag(:mr_commit_neighbor_nav, @project, default_enabled: true)
......
...@@ -20,7 +20,7 @@ RSpec.describe 'a maintainer edits files on a source-branch of an MR from a fork ...@@ -20,7 +20,7 @@ RSpec.describe 'a maintainer edits files on a source-branch of an MR from a fork
end end
before do before do
stub_feature_flags(web_ide_default: false, single_mr_diff_view: false, code_navigation: false) stub_feature_flags(web_ide_default: false, single_mr_diff_view: false)
target_project.add_maintainer(user) target_project.add_maintainer(user)
sign_in(user) sign_in(user)
......
...@@ -13,10 +13,6 @@ RSpec.describe 'File blob', :js do ...@@ -13,10 +13,6 @@ RSpec.describe 'File blob', :js do
wait_for_requests wait_for_requests
end end
before do
stub_feature_flags(code_navigation: false)
end
context 'Ruby file' do context 'Ruby file' do
before do before do
visit_blob('files/ruby/popen.rb') visit_blob('files/ruby/popen.rb')
......
...@@ -77,8 +77,6 @@ RSpec.describe 'Editing file blob', :js do ...@@ -77,8 +77,6 @@ RSpec.describe 'Editing file blob', :js do
context 'from blob file path' do context 'from blob file path' do
before do before do
stub_feature_flags(code_navigation: false)
visit project_blob_path(project, tree_join(branch, file_path)) visit project_blob_path(project, tree_join(branch, file_path))
end end
......
...@@ -8,7 +8,6 @@ RSpec.describe 'User creates blob in new project', :js do ...@@ -8,7 +8,6 @@ RSpec.describe 'User creates blob in new project', :js do
shared_examples 'creating a file' do shared_examples 'creating a file' do
before do before do
stub_feature_flags(code_navigation: false)
sign_in(user) sign_in(user)
visit project_path(project) visit project_path(project)
end end
......
...@@ -14,7 +14,7 @@ RSpec.describe 'Projects > Files > User creates files', :js do ...@@ -14,7 +14,7 @@ RSpec.describe 'Projects > Files > User creates files', :js do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
stub_feature_flags(web_ide_default: false, code_navigation: false) stub_feature_flags(web_ide_default: false)
project.add_maintainer(user) project.add_maintainer(user)
sign_in(user) sign_in(user)
......
...@@ -14,8 +14,6 @@ RSpec.describe 'Projects > Files > User deletes files', :js do ...@@ -14,8 +14,6 @@ RSpec.describe 'Projects > Files > User deletes files', :js do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
stub_feature_flags(code_navigation: false)
sign_in(user) sign_in(user)
end end
......
...@@ -16,8 +16,6 @@ RSpec.describe 'Projects > Files > User replaces files', :js do ...@@ -16,8 +16,6 @@ RSpec.describe 'Projects > Files > User replaces files', :js do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
stub_feature_flags(code_navigation: false)
sign_in(user) sign_in(user)
end end
......
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