diff options
| author | Paco Guzman <pacoguzmanp@gmail.com> | 2016-07-27 20:00:34 +0300 |
|---|---|---|
| committer | Paco Guzman <pacoguzmanp@gmail.com> | 2016-08-03 08:00:20 +0300 |
| commit | c86c1905b5574cac234315598d8d715fcaee3ea7 (patch) | |
| tree | 31ba7ab51c04b07ea70d15db88f2370f9ca6359e /app/services | |
| parent | 1d0c7b74920a94e488e6a2c090abb3e525438053 (diff) | |
switch from diff_file_collection to diffs
So we have raw_diffs too
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/compare_service.rb | 1 | ||||
| -rw-r--r-- | app/services/merge_requests/merge_request_diff_cache_service.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/services/compare_service.rb b/app/services/compare_service.rb index bb3aff72b47..6d6075628af 100644 --- a/app/services/compare_service.rb +++ b/app/services/compare_service.rb @@ -26,7 +26,6 @@ class CompareService source_sha ) - # REVIEW be sure if it's target_project or source_project Compare.new(raw_compare, target_project) end end diff --git a/app/services/merge_requests/merge_request_diff_cache_service.rb b/app/services/merge_requests/merge_request_diff_cache_service.rb index 8151c24d1b0..2945a7fd4e4 100644 --- a/app/services/merge_requests/merge_request_diff_cache_service.rb +++ b/app/services/merge_requests/merge_request_diff_cache_service.rb @@ -2,7 +2,7 @@ module MergeRequests class MergeRequestDiffCacheService def execute(merge_request) # Executing the iteration we cache all the highlighted diff information - merge_request.diff_file_collection.diff_files.to_a + merge_request.diffs.diff_files.to_a end end end |