diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-11-26 08:13:28 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-11-26 08:13:28 -0800 |
| commit | 2f90e71fd337c746c143f21b1806ebc71d907b62 (patch) | |
| tree | 6d5fc6554c3496cd22288c654fecf7deb676df41 /app/models/user.rb | |
| parent | 1befbbf57dddc23761558f21017294c950d6d3b7 (diff) | |
| parent | 3b717c8a8c1e0f10bc06fd8501ce2423c98490d4 (diff) | |
| download | gitlab-ce-2f90e71fd337c746c143f21b1806ebc71d907b62.tar.gz | |
Merge pull request #9670 from janten/gravatar-retina
Add support for HiDPI displays in gravatar service
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9374f01f99f..e1144ca77be 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -637,11 +637,11 @@ class User < ActiveRecord::Base email.start_with?('temp-email-for-oauth') end - def avatar_url(size = nil) + def avatar_url(size = nil, scale = 2) if avatar.present? [gitlab_config.url, avatar.url].join else - GravatarService.new.execute(email, size) + GravatarService.new.execute(email, size, scale) end end |