diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-29 21:19:42 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-29 21:19:42 +0000 |
| commit | 45b61a9ece48550f51432c8cca7de7e1a298ca08 (patch) | |
| tree | b305158d82f83dc16203490ed03e7103d7e523d3 /app/controllers/projects | |
| parent | e4e40b963226099ba76718b692c6c944336c7f5c (diff) | |
| parent | 72ff187c36bc73bddb349269f08f8fb46eab2676 (diff) | |
| download | gitlab-ce-45b61a9ece48550f51432c8cca7de7e1a298ca08.tar.gz | |
Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'
Make new merge request URL more friendly when pushing code
Closes #53012
See merge request gitlab-org/gitlab-ce!22526
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/merge_requests/creations_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index 5639402a1e9..bbf662a63c8 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -89,6 +89,8 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap def build_merge_request params[:merge_request] ||= ActionController::Parameters.new(source_project: @project) + params[:merge_request][:source_branch] ||= params[:merge_request_source_branch].presence + @merge_request = ::MergeRequests::BuildService.new(project, current_user, merge_request_params.merge(diff_options: diff_options)).execute end |