Merge pull request #1296 from Wetpaint/master

Hide the gravatar tip in the profile menu if gravatar is disabled.

Merge pull request #1296 from Wetpaint/master
Hide the gravatar tip in the profile menu if gravatar is disabled.
Dmitriy Zaporozhets
2 parents 6e520d9c 0dbde913
Showing 1 changed file with 4 additions and 3 deletions Show diff stats
app/views/profile/show.html.haml
@@ -45,9 +45,10 @@
           %span.help-block Tell us about yourself in fewer than 250 characters.
     .span5.right
  
-      %p.alert.alert-info
-        %strong Tip:
-        You can change your avatar at gravatar.com
+      -unless Gitlab.config.disable_gravatar?
+        %p.alert.alert-info
+          %strong Tip:
+          You can change your avatar at gravatar.com
  
       %h4
         Personal projects:
...	...	@@ -45,9 +45,10 @@
45	45	%span.help-block Tell us about yourself in fewer than 250 characters.
46	46	.span5.right
47	47
48		- %p.alert.alert-info
49		- %strong Tip:
50		- You can change your avatar at gravatar.com
	48	+ -unless Gitlab.config.disable_gravatar?
	49	+ %p.alert.alert-info
	50	+ %strong Tip:
	51	+ You can change your avatar at gravatar.com
51	52
52	53	%h4
53	54	Personal projects:
...	...