diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-02-25 18:47:35 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-02-25 18:47:35 +0300 |
| commit | 5a0629b483017146eb568b4c6f2ce8397ed1db53 (patch) | |
| tree | 56e17d15bf2d1f6c8be2949b5578afa71ef683a2 /lib | |
| parent | 4441def02383a085b96c0d45ba522b2a372c2275 (diff) | |
| parent | c85a768ca5d8c53b7770fdc4dc8f9eeef237b8c8 (diff) | |
Merge branch '58020-fix-merge-api-endpoint-param' into 'master'
Respect the `should_remove_source_branch` parameter to the merge API
Closes #58020
See merge request gitlab-org/gitlab-ce!25525
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/merge_requests.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index f8d2ba49d2f..03f6684226f 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -369,11 +369,11 @@ module API merge_request.update(squash: params[:squash]) if params[:squash] - merge_params = { + merge_params = HashWithIndifferentAccess.new( commit_message: params[:merge_commit_message], squash_commit_message: params[:squash_commit_message], should_remove_source_branch: params[:should_remove_source_branch] - } + ) if merge_when_pipeline_succeeds && merge_request.head_pipeline && merge_request.head_pipeline.active? ::MergeRequests::MergeWhenPipelineSucceedsService |