diff options
| author | DJ Mountney <david@twkie.net> | 2018-10-30 00:37:19 +0300 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2018-10-30 00:37:19 +0300 |
| commit | 06b6daacb15b92b04e05538b37aadfdb04fc5a4b (patch) | |
| tree | 0500cf47f7d8d2e6bc7ed53cbf9ad957f07fb31a /app/controllers/concerns/creates_commit.rb | |
| parent | c847f172d25efc211045c363f4e55402ad250c09 (diff) | |
| parent | 45b61a9ece48550f51432c8cca7de7e1a298ca08 (diff) | |
Merge remote-tracking branch 'origin/master' into dev-master
Diffstat (limited to 'app/controllers/concerns/creates_commit.rb')
| -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 b3777fd2b0f..f644702cbdb 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 } ) |