diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-22 21:41:37 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-22 21:41:37 +0000 |
| commit | fb83b82c0e78581c5af36830910bfe4a6c95d438 (patch) | |
| tree | a483825543ea72a49486880a2396533e163848bf /lib | |
| parent | 76c8d4fbedb57a3744d32cf52c0acee91eb751f5 (diff) | |
| parent | 48a6cb7f519c74ceddf7a2670c534b57f02c85ca (diff) | |
| download | gitlab-ce-fb83b82c0e78581c5af36830910bfe4a6c95d438.tar.gz | |
Merge branch '60250-remove-mr_push_options-flag' into 'master'
Remove the mr_push_options feature flag
Closes #60250
See merge request gitlab-org/gitlab-ce!28278
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 |