diff options
| author | Luke Duncalfe <lduncalfe@eml.cc> | 2019-05-12 18:47:15 -0500 |
|---|---|---|
| committer | Luke Duncalfe <lduncalfe@eml.cc> | 2019-05-17 13:47:24 +1200 |
| commit | 515f3eb44ab6e11c124dc4a7cc34c94e765783d5 (patch) | |
| tree | f985d5627815cdde365efd9c69d68dbadb3dee0f /lib | |
| parent | 74511b049743cf543694bb92a8acd7e7586e533d (diff) | |
| download | gitlab-ce-515f3eb44ab6e11c124dc4a7cc34c94e765783d5.tar.gz | |
Remove the mr_push_options feature flag
`Gitlab::QueryLimiting.whitelist` has been moved from being inside the
feature flag conditional check to the `process_mr_push_options`
`Api::Internal` helper.
https://gitlab.com/gitlab-org/gitlab-ce/issues/60250
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/helpers/internal_helpers.rb | 2 | ||||
| -rw-r--r-- | lib/api/internal.rb | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb index 71c30ec99a5..c318f5b9127 100644 --- a/lib/api/helpers/internal_helpers.rb +++ b/lib/api/helpers/internal_helpers.rb @@ -46,6 +46,8 @@ module API def process_mr_push_options(push_options, project, user, changes) output = {} + Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/61359') + service = ::MergeRequests::PushOptionsHandlerService.new( project, user, diff --git a/lib/api/internal.rb b/lib/api/internal.rb index c82fd230d7a..224aaaaf006 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -264,12 +264,8 @@ module API PostReceive.perform_async(params[:gl_repository], params[:identifier], params[:changes], push_options.as_json) - if Feature.enabled?(:mr_push_options, default_enabled: true) - Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/61359') - - mr_options = push_options.get(:merge_request) - output.merge!(process_mr_push_options(mr_options, project, user, params[:changes])) if mr_options.present? - end + mr_options = push_options.get(:merge_request) + output.merge!(process_mr_push_options(mr_options, project, user, params[:changes])) if mr_options.present? broadcast_message = BroadcastMessage.current&.last&.message reference_counter_decreased = Gitlab::ReferenceCounter.new(params[:gl_repository]).decrease |