Commit c97bc561 authored by Igor Drozdov's avatar Igor Drozdov

Merge branch 'mo-junit-feature-flag-scope-project' into 'master'

Make junit feature flag scoped by project

See merge request gitlab-org/gitlab!32220
parents 69469cb7 9e5dc798
...@@ -11,7 +11,7 @@ class Projects::PipelinesController < Projects::ApplicationController ...@@ -11,7 +11,7 @@ class Projects::PipelinesController < Projects::ApplicationController
before_action :authorize_create_pipeline!, only: [:new, :create] before_action :authorize_create_pipeline!, only: [:new, :create]
before_action :authorize_update_pipeline!, only: [:retry, :cancel] before_action :authorize_update_pipeline!, only: [:retry, :cancel]
before_action do before_action do
push_frontend_feature_flag(:junit_pipeline_view) push_frontend_feature_flag(:junit_pipeline_view, project)
push_frontend_feature_flag(:filter_pipelines_search, default_enabled: true) push_frontend_feature_flag(:filter_pipelines_search, default_enabled: true)
push_frontend_feature_flag(:dag_pipeline_tab) push_frontend_feature_flag(:dag_pipeline_tab)
end end
......
- test_reports_enabled = Feature.enabled?(:junit_pipeline_view) - test_reports_enabled = Feature.enabled?(:junit_pipeline_view, @project)
- dag_pipeline_tab_enabled = Feature.enabled?(:dag_pipeline_tab) - dag_pipeline_tab_enabled = Feature.enabled?(:dag_pipeline_tab)
.tabs-holder .tabs-holder
......
...@@ -830,7 +830,7 @@ describe Projects::PipelinesController do ...@@ -830,7 +830,7 @@ describe Projects::PipelinesController do
context 'when feature is enabled' do context 'when feature is enabled' do
before do before do
stub_feature_flags(junit_pipeline_view: true) stub_feature_flags(junit_pipeline_view: project)
end end
context 'when pipeline does not have a test report' do context 'when pipeline does not have a test report' do
......
...@@ -15,7 +15,7 @@ describe Projects::PipelinesController, "(JavaScript fixtures)", type: :controll ...@@ -15,7 +15,7 @@ describe Projects::PipelinesController, "(JavaScript fixtures)", type: :controll
before do before do
sign_in(user) sign_in(user)
stub_feature_flags(junit_pipeline_view: true) stub_feature_flags(junit_pipeline_view: project)
end end
it "pipelines/test_report.json" do it "pipelines/test_report.json" do
......
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