Commit 7e3e4c41 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #7190 from Nighoo/gravatar_profile_avatar

do not advertise gravatar in profile if disabled
parents fb3104da b6d79b68
...@@ -68,10 +68,12 @@ ...@@ -68,10 +68,12 @@
%p.light %p.light
- if @user.avatar? - if @user.avatar?
You can change your avatar here You can change your avatar here
- if Gitlab.config.gravatar.enabled
%br %br
or remove the current avatar to revert to #{link_to "gravatar.com", "http://gravatar.com"} or remove the current avatar to revert to #{link_to "gravatar.com", "http://gravatar.com"}
- else - else
You can upload an avatar here You can upload an avatar here
- if Gitlab.config.gravatar.enabled
%br %br
or change it at #{link_to "gravatar.com", "http://gravatar.com"} or change it at #{link_to "gravatar.com", "http://gravatar.com"}
%hr %hr
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment