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/concerns | |
| 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/concerns')
| -rw-r--r-- | app/controllers/concerns/creates_commit.rb | 2 |
1 files changed, 1 insertions, 1 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 } ) |