Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-01-06 18:29:13 +0300
committerLin Jen-Shin <godfat@godfat.org>2017-01-06 18:29:13 +0300
commitccc73c455ba0b95b531c69414a6a1f47667f16b5 (patch)
tree914207fd6b9672bf2a46ea4b37c59b37444a4d91 /app/services/commits
parente3c36850a618ee2f7f9087b681e62d8a50e7b1b1 (diff)
Rename from base to start because base could mean merge base
Diffstat (limited to 'app/services/commits')
-rw-r--r--app/services/commits/change_service.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb
index 1faa052e0ca..25e22f14e60 100644
--- a/app/services/commits/change_service.rb
+++ b/app/services/commits/change_service.rb
@@ -4,8 +4,8 @@ module Commits
class ChangeError < StandardError; end
def execute
- @base_project = params[:base_project] || @project
- @base_branch = params[:base_branch]
+ @start_project = params[:start_project] || @project
+ @start_branch = params[:start_branch]
@target_branch = params[:target_branch]
@commit = params[:commit]
@create_merge_request = params[:create_merge_request].present?
@@ -28,7 +28,7 @@ module Commits
if @create_merge_request
into = @commit.public_send("#{action}_branch_name")
- tree_branch = @base_branch
+ tree_branch = @start_branch
else
into = tree_branch = @target_branch
end
@@ -45,8 +45,8 @@ module Commits
@commit,
into,
tree_id,
- base_project: @base_project,
- base_branch_name: @base_branch)
+ start_project: @start_project,
+ start_branch_name: @start_branch)
success
else