diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-06-20 15:42:10 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-06-20 15:42:10 +0100 |
| commit | 1c4262156f815095b6ca9403fb1c441e2cf3d744 (patch) | |
| tree | 2cd52aac54ed9b2842e75a88b75ab162e7cfd103 /app/helpers/application_helper.rb | |
| parent | 40cd50829944db38fac07014e5fa00eafa3d1bc7 (diff) | |
| download | gitlab-ce-1c4262156f815095b6ca9403fb1c441e2cf3d744.tar.gz | |
Fix avatar images in pipeline emailsfix-email-avatars
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 06bbed777d5..a3b243fccb7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -68,7 +68,7 @@ module ApplicationHelper end end - def avatar_icon(user_or_email = nil, size = nil, scale = 2) + def avatar_icon(user_or_email = nil, size = nil, scale = 2, only_path: true) user = if user_or_email.is_a?(User) user_or_email @@ -77,7 +77,7 @@ module ApplicationHelper end if user - user.avatar_url(size: size) || default_avatar + user.avatar_url(size: size, only_path: only_path) || default_avatar else gravatar_icon(user_or_email, size, scale) end |