summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--app/models/commit.rb9
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5ff0cb42ccc..d2ed7d8708e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.11.0 (unreleased)
- Remove magic comments (`# encoding: UTF-8`) from Ruby files. !5456 (winniehell)
- Fix CI status icon link underline (ClemMakesApps)
+ - Cache the commit author in RequestStore to avoid extra lookups in PostReceive
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
- Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable
- Limit git rev-list output count to one in forced push check
diff --git a/app/models/commit.rb b/app/models/commit.rb
index f80f1063406..6a0d32d406e 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -178,7 +178,14 @@ class Commit
end
def author
- @author ||= User.find_by_any_email(author_email.downcase)
+ key = "commit_author:#{author_email}"
+
+ # nil is a valid value since no author may exist in the system
+ unless RequestStore.store.has_key?(key)
+ RequestStore.store[key] = User.find_by_any_email(author_email.downcase)
+ end
+
+ @author ||= RequestStore.store[key]
end
def committer