diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-21 07:47:41 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-21 07:47:41 +0000 |
| commit | 5213bf2bf713f1647c05821d42afea90d93a57b6 (patch) | |
| tree | 4224004367013ba02b5bba24bdfcda3bb03ae4e8 /app/helpers/application_helper.rb | |
| parent | 1578ee93475c0ebb62399403d971e99aa45e7276 (diff) | |
| download | gitlab-ce-revert-1578ee93.tar.gz | |
Revert "Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce"revert-1578ee93
This reverts commit 1578ee93475c0ebb62399403d971e99aa45e7276
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 a3b243fccb7..06bbed777d5 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, only_path: true) + def avatar_icon(user_or_email = nil, size = nil, scale = 2) 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, only_path: only_path) || default_avatar + user.avatar_url(size: size) || default_avatar else gravatar_icon(user_or_email, size, scale) end |