Commit c7b68b6e authored by Robert Speicher's avatar Robert Speicher
Browse files

Dumb-down avatar presence check in `avatar_url` methods

`avatar.present?` goes through CarrierWave, and checks that the file
exists on disk and checks its filesize. Because we're hitting the disk,
this adds extra overhead to something where the worst-case scenario is
rendering a broken image.

Instead, we now just check that the _database attribute_ is present,
which is good enough for our purposes.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/19273
parent e4488ab44031
......@@ -90,7 +90,7 @@ def visibility_level_allowed_by_projects
end
def avatar_url(size = nil)
if avatar.present?
if self[:avatar].present?
[gitlab_config.url, avatar.url].join
end
end
......
......@@ -701,7 +701,7 @@ def avatar_in_git
end
def avatar_url
if avatar.present?
if self[:avatar].present?
[gitlab_config.url, avatar.url].join
elsif avatar_in_git
Gitlab::Routing.url_helpers.namespace_project_avatar_url(namespace, self)
......
......@@ -653,7 +653,7 @@ def temp_oauth_email?
end
def avatar_url(size = nil, scale = 2)
if avatar.present?
if self[:avatar].present?
[gitlab_config.url, avatar.url].join
else
GravatarService.new.execute(email, size, scale)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment