kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Stan Hu 2019-05-22 21:41:37 +00:00
parent 76c8d4fbed 48a6cb7f51
commit fb83b82c0e
4 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/60250-remove-mr_push_options-flag.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Remove the mr_push_options feature flag
merge_request: 28278
author:
type: changed

2
lib/api/helpers/internal_helpers.rb
View File

@ -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,

8
lib/api/internal.rb
View File

@ -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

12
spec/requests/api/internal_spec.rb
View File

@ -997,18 +997,6 @@ describe API::Internal do
expect(json_response['warnings']).to eq('Error encountered with push options \'merge_request.create\': my error')
end
context 'when the feature is disabled' do
it 'does not invoke MergeRequests::PushOptionsHandlerService' do
stub_feature_flags(mr_push_options: false)
expect(MergeRequests::PushOptionsHandlerService).not_to receive(:new)
expect do
post api('/internal/post_receive'), params: valid_params
end.not_to change { MergeRequest.count }
end
end
end
context 'broadcast message exists' do