Не подтверждена Коммит 80a3ce59 создал по автору Luke Duncalfe's avatar Luke Duncalfe Зафиксировано автором Nick Thomas
Просмотр файлов
владелец fe9ee419
......@@ -264,8 +264,10 @@ def lfs_authentication_url(project)
PostReceive.perform_async(params[:gl_repository], params[:identifier],
params[:changes], push_options.as_json)
mr_options = push_options.get(:merge_request)
output.merge!(process_mr_push_options(mr_options, project, user, params[:changes])) if mr_options.present?
if Feature.enabled?(:mr_push_options, default_enabled: true)
mr_options = push_options.get(:merge_request)
output.merge!(process_mr_push_options(mr_options, project, user, params[:changes])) if mr_options.present?
end
broadcast_message = BroadcastMessage.current&.last&.message
reference_counter_decreased = Gitlab::ReferenceCounter.new(params[:gl_repository]).decrease
......
......@@ -995,6 +995,20 @@
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
Feature.disable(:mr_push_options)
expect(MergeRequests::PushOptionsHandlerService).to receive(:new)
expect do
post api('/internal/post_receive'), params: valid_params
end.not_to change { MergeRequest.count }
Feature.enable(:mr_push_options)
end
end
end
context 'broadcast message exists' do
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать