diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-06-14 17:38:27 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-06-16 16:33:09 -0300 |
| commit | c4720170786d8a16eccfffb12efd5887a5cf69b5 (patch) | |
| tree | f3bf17b5dd337affe3149e09f077a2344190a3f9 /lib/api/merge_requests.rb | |
| parent | 43e1481c8191651880fe20ff2b07a5501a5f7112 (diff) | |
| download | gitlab-ce-c4720170786d8a16eccfffb12efd5887a5cf69b5.tar.gz | |
Fix API bug accepting wrong merge requests parametersissue_33205
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 710deba5ae3..3671b53abbd 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -97,7 +97,7 @@ module API authorize! :create_merge_request, user_project mr_params = declared_params(include_missing: false) - mr_params[:force_remove_source_branch] = mr_params.delete(:remove_source_branch) if mr_params[:remove_source_branch].present? + mr_params[:force_remove_source_branch] = mr_params.delete(:remove_source_branch) merge_request = ::MergeRequests::CreateService.new(user_project, current_user, mr_params).execute |