Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 4 deletions

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 57069280ef7..aae49c36899 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -257,10 +257,9 @@ class Commit
   end
 
   def author
-    # We use __sync so that we get the actual objects back (including an actual
-    # nil), instead of a wrapper, as returning a wrapped nil breaks a lot of
-    # code.
-    lazy_author.__sync
+    strong_memoize(:author) do
+      lazy_author&.itself
+    end
   end
   request_cache(:author) { author_email.downcase }