diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-07 13:32:20 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-07 13:32:20 +0000 |
| commit | e0054a9ab1dc7f99acff7b4614242a3dbf9328ee (patch) | |
| tree | f1a362a4312fb5937b7fd1b74e3f6065189496af /app/controllers/projects | |
| parent | 0cd22a382ef390cda6dab001ab5e4738dd25b3a5 (diff) | |
| download | gitlab-ce-e0054a9ab1dc7f99acff7b4614242a3dbf9328ee.tar.gz | |
Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'"
This reverts merge request !22526
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/merge_requests/creations_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index bbf662a63c8..5639402a1e9 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -89,8 +89,6 @@ 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 |