diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-04 20:38:55 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-04 20:38:55 +0300 |
| commit | 585f5cfa3359496733b5bd344ae89f98b5578865 (patch) | |
| tree | 5bc8be3aaad29c6b5a3613aff46a739b9c89708e /app | |
| parent | 53c46a22dc11b7a01e8a7547c255533d6836b355 (diff) | |
| parent | fb5682e7cd587e7e6c871588240fc49b325b042f (diff) | |
Merge branch 'gravatar-fix' into 'master'
Use the new admin settings for gravatar
Fixes gitlab-org/gitlab-ce#14826
See merge request !3988
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/profiles/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index f59d27f7ed0..eef50d887c7 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -8,11 +8,11 @@ %p - if @user.avatar? You can change your avatar here - - if Gitlab.config.gravatar.enabled + - if gravatar_enabled? or remove the current avatar to revert to #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host} - else You can upload an avatar here - - if Gitlab.config.gravatar.enabled + - if gravatar_enabled? or change it at #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host} .col-lg-9 .clearfix.avatar-image.append-bottom-default |