diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-26 10:56:08 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-06-01 10:07:24 -0500 |
| commit | dcd002a15bd9a3efee7b75de17c0f6d303c2a009 (patch) | |
| tree | 3fd8d97ccfa808bcaa59ee13c0b1450fbc7539ec /app/models/user.rb | |
| parent | bd259d6bab4b3c9856be6c3d2e0c16e0836c9380 (diff) | |
| download | gitlab-ce-dcd002a15bd9a3efee7b75de17c0f6d303c2a009.tar.gz | |
Add username parameter to gravatar URL
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9b0c1ebd7c5..53ccb4121b5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -794,7 +794,7 @@ class User < ActiveRecord::Base def avatar_url(size: nil, scale: 2, **args) # We use avatar_path instead of overriding avatar_url because of carrierwave. # See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11001/diffs#note_28659864 - avatar_path(args) || GravatarService.new.execute(email, size, scale) + avatar_path(args) || GravatarService.new.execute(email, size, scale, username: username) end def all_emails |