diff options
| author | Sergey Linnik <linniksa@gmail.com> | 2012-11-19 02:36:50 +0400 |
|---|---|---|
| committer | Sergey Linnik <linniksa@gmail.com> | 2012-12-07 00:03:13 +0400 |
| commit | 2c37fa381e80135b7b2e87163a46ca2ecee15925 (patch) | |
| tree | 8d7bc115ef0022fd40bdf7e910e129cc8cbd45ce /app/helpers | |
| parent | 552c2d665bf4f5bbb6fc0a4f04ec30e4263bbfe4 (diff) | |
| download | gitlab-ce-2c37fa381e80135b7b2e87163a46ca2ecee15925.tar.gz | |
fix some glitches in gravatar image url generation
always use proper size value
do not show alt text when avatar image not loaded
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a689213bcee..e130c09539f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -30,7 +30,9 @@ module ApplicationHelper args.any? { |v| v.to_s.downcase == action_name } end - def gravatar_icon(user_email = '', size = 40) + def gravatar_icon(user_email = '', size = nil) + size = 40 if size.nil? || size <= 0 + if Gitlab.config.disable_gravatar? || user_email.blank? 'no_avatar.png' else |