summaryrefslogtreecommitdiff
path: root/app/controllers/concerns/creates_commit.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-12-14 01:47:17 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-12-14 01:47:17 +0800
commitdc4b3dd0ae5d6e0b55ba6723e5deff6eee127409 (patch)
tree8302a15b41e700c8a423b254092fd2554cde91d3 /app/controllers/concerns/creates_commit.rb
parent26af4b5a61d5cdaffa7769336f40cd0861f6b1d4 (diff)
downloadgitlab-ce-dc4b3dd0ae5d6e0b55ba6723e5deff6eee127409.tar.gz
Fix source_project and also pass source_project
Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747556
Diffstat (limited to 'app/controllers/concerns/creates_commit.rb')
-rw-r--r--app/controllers/concerns/creates_commit.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index d2fcb2efd6a..a94077c2bd4 100644
--- a/app/controllers/concerns/creates_commit.rb
+++ b/app/controllers/concerns/creates_commit.rb
@@ -6,12 +6,12 @@ module CreatesCommit
source_branch = @ref if @ref && @repository.find_branch(@ref)
commit_params = @commit_params.merge(
- source_project: @project,
+ source_project: @tree_edit_project,
source_branch: source_branch,
target_branch: @target_branch
)
- result = service.new(@tree_edit_project, current_user, commit_params).execute
+ result = service.new(@project, current_user, commit_params).execute
if result[:status] == :success
update_flash_notice(success_notice)