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

Merge branch '46903-osw-fix-permitted-params-filtering-on-merge-scheduling' into 'master'

Browse source 
Adjust permitted params filtering on merge scheduling

Closes #46903

See merge request gitlab-org/gitlab-ce!19255
This commit is contained in:
Sean McGivern 2018-05-31 08:33:06 +00:00
commit ec1d3e104a
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/projects/merge_requests_controller.rb
View file

@ -296,14 +296,14 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
elsif @merge_request.actual_head_pipeline.success? elsif @merge_request.actual_head_pipeline.success?
# This can be triggered when a user clicks the auto merge button while # This can be triggered when a user clicks the auto merge button while
# the tests finish at about the same time # the tests finish at about the same time
@merge_request.merge_async(current_user.id, params) @merge_request.merge_async(current_user.id, merge_params)
:success :success
else else
:failed :failed
end end
else else
@merge_request.merge_async(current_user.id, params) @merge_request.merge_async(current_user.id, merge_params)
:success :success
end end

5
changelogs/unreleased/46903-osw-fix-permitted-params-filtering-on-merge-scheduling.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Adjust permitted params filtering on merge scheduling
merge_request:
author:
type: fixed

4
spec/controllers/projects/merge_requests_controller_spec.rb
View file

@ -326,8 +326,8 @@ describe Projects::MergeRequestsController do
expect(json_response).to eq('status' => 'success') expect(json_response).to eq('status' => 'success')
end end
it 'starts the merge immediately' do it 'starts the merge immediately with permitted params' do
expect(MergeWorker).to receive(:perform_async).with(merge_request.id, anything, anything) expect(MergeWorker).to receive(:perform_async).with(merge_request.id, anything, { 'squash' => false })
merge_with_sha merge_with_sha
end end