diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-19 08:06:01 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-19 08:06:01 +0000 |
| commit | a4a5cbf29a983d05b5fc69f8e63fc37e100c8637 (patch) | |
| tree | 66169527ba85bd95e181d7459cde6ee993e5d42a /lib/api | |
| parent | ea59f664e7ee76f276178b35ee1651419b5100b4 (diff) | |
| parent | c4720170786d8a16eccfffb12efd5887a5cf69b5 (diff) | |
| download | gitlab-ce-a4a5cbf29a983d05b5fc69f8e63fc37e100c8637.tar.gz | |
Merge branch 'issue_33205' into 'master'
Fix API bug accepting wrong merge requests parameters
Closes #33205
See merge request !12173
Diffstat (limited to 'lib/api')
| -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 |