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-05 21:11:27 +0300
committerLin Jen-Shin <godfat@godfat.org>2017-01-05 21:11:27 +0300
commitae86a1b9d3c9ca4ce592fa89085acd059ffc09a0 (patch)
treeed6befd4c3eba826a3bfbfe47b6b275e3c9e34fc /app/services/commits
parent5e12b3d841b0da1a2c6047de53a033107bbb5c32 (diff)
Just trust set_commit_variables to set everything!
Removing those weird setup in assign_change_commit_vars fixed all the failures in the tests. I still cannot say why but clearly we need to have better names. It's so confusing right now. We should seriously stop fiddling those instance variables.
Diffstat (limited to 'app/services/commits')
-rw-r--r--app/services/commits/change_service.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb
index 9b241aa8b04..60bd59a5d9f 100644
--- a/app/services/commits/change_service.rb
+++ b/app/services/commits/change_service.rb
@@ -5,6 +5,7 @@ module Commits
def execute
@source_project = params[:source_project] || @project
+ @source_branch = params[:source_branch]
@target_branch = params[:target_branch]
@commit = params[:commit]
@create_merge_request = params[:create_merge_request].present?
@@ -38,7 +39,7 @@ module Commits
into,
tree_id,
source_project: @source_project,
- source_branch_name: @target_branch)
+ source_branch_name: @source_branch)
success
else