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.
df2433db · Dmitriy Zaporozhets · 6e520d9c · 0dbde913 · df2433db
Commit df2433db authored Aug 25, 2012 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

app/views/profile/show.html.haml app/views/profile/show.html.haml +4 -3

No files found.
--- a/app/views/profile/show.html.haml
+++ b/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: