diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-08-25 06:15:59 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-08-25 06:15:59 -0700 |
| commit | df2433db54bad8e2963d373e076ce642f0093aad (patch) | |
| tree | 0007d2bc548362b9220b65b7dfcfd3ef89ac55fd | |
| parent | 6e520d9caeaf3d0427854b701b7f5bb0fcac1d73 (diff) | |
| parent | 0dbde913dcfd8559433ef57a28e84b9e9f266f90 (diff) | |
| download | gitlab-ce-df2433db54bad8e2963d373e076ce642f0093aad.tar.gz | |
Merge pull request #1296 from Wetpaint/master
Hide the gravatar tip in the profile menu if gravatar is disabled.
| -rw-r--r-- | app/views/profile/show.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/profile/show.html.haml b/app/views/profile/show.html.haml index 95cce2bb6b6..a7b6a18ad2d 100644 --- 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: |