Merge pull request #7190 from Nighoo/gravatar_profile_avatar

do not advertise gravatar in profile if disabled

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