summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-01 12:13:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-01 12:13:12 +0000
commitd27481e8f3dd252b543f65cb56a98eeb00de855f (patch)
tree4d4c065f0bbc5c51b61b1d34b2ac1bfdfb3e050b /app
parent0f9e3a905651933ea4ca04712ae77ec47d8562e5 (diff)
downloadgitlab-ce-d27481e8f3dd252b543f65cb56a98eeb00de855f.tar.gz
Add latest changes from gitlab-org/security/gitlab@15-11-stable-ee
Diffstat (limited to 'app')
-rw-r--r--app/helpers/avatars_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
index 0fac2cb5fc5..57075a44d0f 100644
--- a/app/helpers/avatars_helper.rb
+++ b/app/helpers/avatars_helper.rb
@@ -116,7 +116,7 @@ module AvatarsHelper
private
def avatar_icon_by_user_email_or_gravatar(email, size, scale, only_path:)
- user = User.find_by_any_email(email)
+ user = User.with_public_email(email).first
if user
avatar_icon_for_user(user, size, scale, only_path: only_path)