summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/merge_request_diff_cache_service.rb
diff options
context:
space:
mode:
authorPaco Guzman <pacoguzmanp@gmail.com>2016-07-27 13:09:52 +0200
committerPaco Guzman <pacoguzmanp@gmail.com>2016-08-03 07:00:20 +0200
commit1d0c7b74920a94e488e6a2c090abb3e525438053 (patch)
tree746321bd5aa1d580f8df0337389fb92bb64ca1eb /app/services/merge_requests/merge_request_diff_cache_service.rb
parent8f359ea9170b984ad43d126e17628c31ac3a1f14 (diff)
downloadgitlab-ce-1d0c7b74920a94e488e6a2c090abb3e525438053.tar.gz
Introduce Compare model in the codebase.
This object will manage Gitlab::Git::Compare instances
Diffstat (limited to 'app/services/merge_requests/merge_request_diff_cache_service.rb')
-rw-r--r--app/services/merge_requests/merge_request_diff_cache_service.rb2
1 files changed, 1 insertions, 1 deletions
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 982540ba7f5..8151c24d1b0 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(Gitlab::Diff::FileCollection.default_options).diff_files.to_a
+ merge_request.diff_file_collection.diff_files.to_a
end
end
end