summaryrefslogtreecommitdiff
path: root/app/controllers/concerns/creates_commit.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-01-06 23:29:13 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-01-06 23:29:13 +0800
commitccc73c455ba0b95b531c69414a6a1f47667f16b5 (patch)
tree914207fd6b9672bf2a46ea4b37c59b37444a4d91 /app/controllers/concerns/creates_commit.rb
parente3c36850a618ee2f7f9087b681e62d8a50e7b1b1 (diff)
downloadgitlab-ce-ccc73c455ba0b95b531c69414a6a1f47667f16b5.tar.gz
Rename from base to start because base could mean merge base
Diffstat (limited to 'app/controllers/concerns/creates_commit.rb')
-rw-r--r--app/controllers/concerns/creates_commit.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index 646d922cb24..2ece99aebc0 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
- base_branch = @mr_target_branch unless initial_commit?
+ start_branch = @mr_target_branch unless initial_commit?
commit_params = @commit_params.merge(
- base_project: @mr_target_project,
- base_branch: base_branch,
+ start_project: @mr_target_project,
+ start_branch: start_branch,
target_branch: @mr_source_branch
)