summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-12-07 19:50:08 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-12-07 19:50:08 +0800
commit6ae1a73cfdad4b98176bb99846042d4378119de2 (patch)
tree501de5fd5ab59d3cca7d5fa8412eb20d76da776a /app/models
parent65806ec632f2ea1e2087b7cdc64f13e6db49c88a (diff)
downloadgitlab-ce-6ae1a73cfdad4b98176bb99846042d4378119de2.tar.gz
Pass source_branch properly for cherry-pick/revert
Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237/diffs#note_19210818
Diffstat (limited to 'app/models')
-rw-r--r--app/models/repository.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 491d2ab69b2..36cbb0d051e 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -962,14 +962,16 @@ class Repository
end
end
- def revert(user, commit, base_branch, revert_tree_id = nil)
+ def revert(
+ user, commit, base_branch, revert_tree_id = nil,
+ source_branch: nil, source_project: project)
revert_tree_id ||= check_revert_content(commit, base_branch)
return false unless revert_tree_id
GitOperationService.new(user, self).with_branch(
base_branch,
- source_commit: commit) do
+ source_branch: source_branch, source_project: source_project) do
source_sha = find_branch(base_branch).dereferenced_target.sha
committer = user_to_committer(user)
@@ -983,14 +985,16 @@ class Repository
end
end
- def cherry_pick(user, commit, base_branch, cherry_pick_tree_id = nil)
+ def cherry_pick(
+ user, commit, base_branch, cherry_pick_tree_id = nil,
+ source_branch: nil, source_project: project)
cherry_pick_tree_id ||= check_cherry_pick_content(commit, base_branch)
return false unless cherry_pick_tree_id
GitOperationService.new(user, self).with_branch(
base_branch,
- source_commit: commit) do
+ source_branch: source_branch, source_project: source_project) do
source_sha = find_branch(base_branch).dereferenced_target.sha
committer = user_to_committer(user)