Commit 0e31e8f4 authored by Kerri Miller's avatar Kerri Miller

Merge branch 'mgill/remove-merge-querylimit' into 'master'

Remove QueryLimiting for MergeRequestsController#merge

See merge request gitlab-org/gitlab!57346
parents 82da9ec1 69cb3f21
......@@ -16,7 +16,6 @@ module EE
push_frontend_feature_flag(:usage_data_i_testing_load_performance_widget_total, @project, default_enabled: true)
end
before_action :disable_query_limiting_ee_merge, only: [:merge]
before_action :authorize_read_pipeline!, only: [:container_scanning_reports, :dependency_scanning_reports,
:sast_reports, :secret_detection_reports, :dast_reports,
:metrics_reports, :coverage_fuzzing_reports,
......@@ -61,12 +60,6 @@ module EE
def api_fuzzing_reports
reports_response(merge_request.compare_api_fuzzing_reports(current_user), head_pipeline)
end
private
def disable_query_limiting_ee_merge
::Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/issues/4792')
end
end
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