diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-11-07 20:04:35 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-11-07 20:04:35 +0300 |
| commit | 06e8cf58558cccc5a8556e94c93aa4bf25dc083e (patch) | |
| tree | ff70c85f5445127d7a3d2813da3b3ec7904bb3e5 /app/controllers | |
| parent | 98762fe651ea0c4b14106166a742feaba332c128 (diff) | |
| parent | e0054a9ab1dc7f99acff7b4614242a3dbf9328ee (diff) | |
Merge branch 'revert-45b61a9e' into 'master'
Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'"
See merge request gitlab-org/gitlab-ce!22875
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/creates_commit.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests/creations_controller.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index f644702cbdb..b3777fd2b0f 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -86,10 +86,10 @@ module CreatesCommit def new_merge_request_path project_new_merge_request_path( @project_to_commit_into, - merge_request_source_branch: @branch_name, merge_request: { source_project_id: @project_to_commit_into.id, target_project_id: @project.id, + source_branch: @branch_name, target_branch: @start_branch } ) 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 |