diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-01-06 22:05:30 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-01-06 22:05:30 +0800 |
| commit | a4b97b2cb61c03d08e25cf2cd7fcbb3f21611350 (patch) | |
| tree | 5d19444b07a143eb6cac69f5a64f41792455e40d /app/controllers/concerns | |
| parent | 593228ffe3b2e4ff82c4d63e5d5c59b835f70085 (diff) | |
| download | gitlab-ce-a4b97b2cb61c03d08e25cf2cd7fcbb3f21611350.tar.gz | |
Rename source to base to avoid confusion from MR
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/creates_commit.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 258791bb5cd..c503f8bf696 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -4,10 +4,10 @@ module CreatesCommit def create_commit(service, success_path:, failure_path:, failure_view: nil, success_notice: nil) set_commit_variables - source_branch = @mr_target_branch unless initial_commit? + base_branch = @mr_target_branch unless initial_commit? commit_params = @commit_params.merge( - source_project: @mr_target_project, - source_branch: source_branch, + base_project: @mr_target_project, + base_branch: base_branch, target_branch: @mr_source_branch ) |