summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-07-29 13:46:39 -0700
committerAhmad Sherif <me@ahmadsherif.com>2016-08-03 19:24:28 +0200
commit6eba7188f1cd1fc0bfcb8b1cf46f40338dc892b5 (patch)
tree622da4b3fd2e6fcac4ef32494ea4f8d10e05cc65
parenta16c26c957ae893f6957fd0ad66c189d0b8ca079 (diff)
downloadgitlab-ce-6eba7188f1cd1fc0bfcb8b1cf46f40338dc892b5.tar.gz
Use only deltas in diffs when scanning the last commit for changes in the avatar to save memory
-rw-r--r--CHANGELOG2
-rw-r--r--app/models/repository.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8d0e377e31a..864b8afaf7d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -57,7 +57,7 @@ v 8.11.0 (unreleased)
- Sensible state specific default sort order for issues and merge requests !5453 (tomb0y)
- Fix RequestProfiler::Middleware error when code is reloaded in development
- Catch what warden might throw when profiling requests to re-throw it
- - Speed up Commit#repo_changes
+ - Speed up and reduce memory usage of Commit#repo_changes and Repository#expire_avatar_cache
v 8.10.3
- Fix Import/Export issue importing milestones and labels not associated properly. !5426
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 3d95344a68f..c1170c470ea 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -372,7 +372,7 @@ class Repository
# We don't want to flush the cache if the commit didn't actually make any
# changes to any of the possible avatar files.
if revision && commit = self.commit(revision)
- return unless commit.raw_diffs.
+ return unless commit.raw_diffs(deltas_only: true).
any? { |diff| AVATAR_FILES.include?(diff.new_path) }
end