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 17:05:30 +0300
committerLin Jen-Shin <godfat@godfat.org>2017-01-06 17:05:30 +0300
commita4b97b2cb61c03d08e25cf2cd7fcbb3f21611350 (patch)
tree5d19444b07a143eb6cac69f5a64f41792455e40d /app/services/commits
parent593228ffe3b2e4ff82c4d63e5d5c59b835f70085 (diff)
Rename source to base to avoid confusion from MR
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 8d1dfbcea7d..1faa052e0ca 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
- @source_project = params[:source_project] || @project
- @source_branch = params[:source_branch]
+ @base_project = params[:base_project] || @project
+ @base_branch = params[:base_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 = @source_branch
+ tree_branch = @base_branch
else
into = tree_branch = @target_branch
end
@@ -45,8 +45,8 @@ module Commits
@commit,
into,
tree_id,
- source_project: @source_project,
- source_branch_name: @source_branch)
+ base_project: @base_project,
+ base_branch_name: @base_branch)
success
else