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:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-03-03 20:38:44 +0300
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-03-03 20:38:44 +0300
commit1764e1b7cb2bffb9b4c4a69991fe2c4d21ce5459 (patch)
treeb48ca1bad0532a37a19f00f0903a778109a16a3d /app/services/compare_service.rb
parente1bc808746523309476913033b104345c06c4816 (diff)
Use Gitlab::Git::DiffCollections
Diffstat (limited to 'app/services/compare_service.rb')
-rw-r--r--app/services/compare_service.rb12
1 files changed, 5 insertions, 7 deletions
diff --git a/app/services/compare_service.rb b/app/services/compare_service.rb
index ec581658fc1..e2bccbdbcc3 100644
--- a/app/services/compare_service.rb
+++ b/app/services/compare_service.rb
@@ -1,7 +1,7 @@
require 'securerandom'
# Compare 2 branches for one repo or between repositories
-# and return Gitlab::CompareResult object that responds to commits and diffs
+# and return Gitlab::Git::Compare object that responds to commits and diffs
class CompareService
def execute(source_project, source_branch, target_project, target_branch, diff_options = {})
source_commit = source_project.commit(source_branch)
@@ -20,12 +20,10 @@ class CompareService
)
end
- Gitlab::CompareResult.new(
- Gitlab::Git::Compare.new(
- target_project.repository.raw_repository,
- target_branch,
- source_sha,
- ), diff_options
+ Gitlab::Git::Compare.new(
+ target_project.repository.raw_repository,
+ target_branch,
+ source_sha,
)
end
end