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>2016-12-08 12:57:52 +0300
committerLin Jen-Shin <godfat@godfat.org>2016-12-08 12:57:52 +0300
commit8384d0d8d528ffdd60c9ba9e3c0c9f688cb560ef (patch)
treefb84cc230333c82d64b248f4fa83a0d5b8d49c24 /app/services/merge_requests
parent23032467d4a1282f69e76bba921bd71c0083f7a8 (diff)
Introduce Repository#with_tmp_ref which we need
commits from the other repository. We'll cleanup the tmp ref after we're done with our business.
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r--app/services/merge_requests/build_service.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index bebfca7537b..a52a94c5ffa 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -16,9 +16,10 @@ module MergeRequests
messages = validate_branches(merge_request)
return build_failed(merge_request, messages) unless messages.empty?
- compare = CompareService.new.execute(
+ compare = CompareService.new(
merge_request.source_project,
- merge_request.source_branch,
+ merge_request.source_branch
+ ).execute(
merge_request.target_project,
merge_request.target_branch,
)