Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/gitlab/x509/signature.rb b/lib/gitlab/x509/signature.rb
index 3b941853ebd..6eaa623fab6 100644
--- a/lib/gitlab/x509/signature.rb
+++ b/lib/gitlab/x509/signature.rb
@@ -27,8 +27,8 @@ module Gitlab
         X509Certificate.safe_create!(certificate_attributes) unless verified_signature.nil?
       end
 
-      def user
-        strong_memoize(:user) { User.find_by_any_email(@email) }
+      def signed_by_user
+        strong_memoize(:signed_by_user) { User.find_by_any_email(@email) }
       end
 
       def verified_signature
@@ -40,9 +40,9 @@ module Gitlab
           x509_certificate.nil? ||
           x509_certificate.revoked? ||
           !verified_signature ||
-          user.nil?
+          signed_by_user.nil?
 
-        if user.verified_emails.include?(@email.downcase) && certificate_email.casecmp?(@email)
+        if signed_by_user.verified_emails.include?(@email.downcase) && certificate_email.casecmp?(@email)
           :verified
         else
           :unverified