Merge branch 'master' of github.com:gitlabhq/gitlabhq

CONTRIBUTING.md

@@ -113,4 +113,4 @@ For examples of feedback on merge requests please look at already [closed merge
 1.  [Shell commands](doc/development/shell_commands.md) created by GitLab contributors to enhance security
 1.  [Markdown](http://www.cirosantilli.com/markdown-styleguide)
 
-This is also the style used by linting tools such as [Rubocop](https://github.com/bbatsov/rubocop), PullReview[https://www.pullreview.com/] and [Hound CI](https://houndci.com).
+This is also the style used by linting tools such as [Rubocop](https://github.com/bbatsov/rubocop), [PullReview](https://www.pullreview.com/) and [Hound CI](https://houndci.com).

app/views/profiles/show.html.haml

@@ -68,10 +68,12 @@
             %p.light
               - if @user.avatar?
                 You can change your avatar here
+                - 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
+                - if Gitlab.config.gravatar.enabled
                   %br
                   or change it at #{link_to "gravatar.com", "http://gravatar.com"}
             %hr