From b6d79b681b62268ba3318d5453695a4968b06cb0 Mon Sep 17 00:00:00 2001 From: Nico Suhl Date: Tue, 24 Jun 2014 16:57:34 +0200 Subject: [PATCH] do not advertise gravatar in profile if disabled --- app/views/profiles/show.html.haml | 10 ++++++---- 1 file 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