Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Suhl <nico@overninethousand.de>2014-06-24 18:57:34 +0400
committerNico Suhl <nico@overninethousand.de>2014-06-24 18:57:34 +0400
commitb6d79b681b62268ba3318d5453695a4968b06cb0 (patch)
tree47ae818ed87f189d9539080dac24f69322c74599 /app/views/profiles/show.html.haml
parent5eb734905cc92ce25ae29cc4f23a682d03b1fc8a (diff)
do not advertise gravatar in profile if disabled
Diffstat (limited to 'app/views/profiles/show.html.haml')
-rw-r--r--app/views/profiles/show.html.haml10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 9a4c13af975..e03a43cbf1f 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -68,12 +68,14 @@
%p.light
- if @user.avatar?
You can change your avatar here
- %br
- or remove the current avatar to revert to #{link_to "gravatar.com", "http://gravatar.com"}
+ - if Gitlab.config.gravatar.enabled
+ %br
+ or remove the current avatar to revert to #{link_to "gravatar.com", "http://gravatar.com"}
- else
You can upload an avatar here
- %br
- or change it at #{link_to "gravatar.com", "http://gravatar.com"}
+ - if Gitlab.config.gravatar.enabled
+ %br
+ or change it at #{link_to "gravatar.com", "http://gravatar.com"}
%hr
%a.choose-btn.btn.btn-small.js-choose-user-avatar-button
%i.icon-paper-clip