Commit 8202e1b4 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch '13132-add-report-from-backend-feature-flags-ee' into 'master'

Resolve "Add feature flags for moving reports to the backend"

See merge request gitlab-org/gitlab-ee!14977
parents d3e25a02 7e23815a
......@@ -8,6 +8,14 @@ module EE
APPROVAL_RENDERING_ACTIONS = [:approve, :approvals, :unapprove].freeze
prepended do
before_action only: [:show] do
push_frontend_feature_flag(:sast_merge_request_report_api)
push_frontend_feature_flag(:dast_merge_request_report_api)
push_frontend_feature_flag(:container_scanning_merge_request_report_api)
push_frontend_feature_flag(:dependency_scanning_merge_request_report_api)
push_frontend_feature_flag(:license_management_merge_request_report_api)
end
before_action :whitelist_query_limiting_ee_merge, only: [:merge]
before_action :whitelist_query_limiting_ee_show, only: [:show]
end
......
......@@ -3,8 +3,19 @@
module EE
module Projects
module PipelinesController
extend ActiveSupport::Concern
extend ::Gitlab::Utils::Override
prepended do
# Since feature flags are pushed only once on page load, we need to
# ensure they're pushed for all tabs in the pipelines view. This is
# because the user can freely navigate between them *without*
# triggering a page load.
before_action only: [:show, :builds, :failures, :security, :licenses] do
push_frontend_feature_flag(:pipeline_report_api)
end
end
def security
if pipeline.expose_security_dashboard?
render_show
......
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