diff options
author | Rémy Coutable <remy@rymai.me> | 2016-05-04 17:38:55 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-05-04 17:38:55 +0000 |
commit | 585f5cfa3359496733b5bd344ae89f98b5578865 (patch) | |
tree | 5bc8be3aaad29c6b5a3613aff46a739b9c89708e | |
parent | 53c46a22dc11b7a01e8a7547c255533d6836b355 (diff) | |
parent | fb5682e7cd587e7e6c871588240fc49b325b042f (diff) | |
download | gitlab-ce-585f5cfa3359496733b5bd344ae89f98b5578865.tar.gz |
Merge branch 'gravatar-fix' into 'master'
Use the new admin settings for gravatar
Fixes gitlab-org/gitlab-ce#14826
See merge request !3988
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/views/profiles/show.html.haml | 4 | ||||
-rw-r--r-- | config/gitlab.yml.example | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index b2f5c283a1a..25d26535b72 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,7 @@ v 8.8.0 (unreleased) - Added multiple colors for labels in dropdowns when dups happen. - Improve description for the Two-factor Authentication sign-in screen. (Connor Shea) - API support for the 'since' and 'until' operators on commit requests (Paco Guzman) + - Fix Gravatar hint in user profile when Gravatar is disabled. !3988 (Artem Sidorenko) v 8.7.3 - Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index f59d27f7ed0..eef50d887c7 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -8,11 +8,11 @@ %p - if @user.avatar? You can change your avatar here - - if Gitlab.config.gravatar.enabled + - if gravatar_enabled? or remove the current avatar to revert to #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host} - else You can upload an avatar here - - if Gitlab.config.gravatar.enabled + - if gravatar_enabled? or change it at #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host} .col-lg-9 .clearfix.avatar-image.append-bottom-default diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 07ce4b6d715..e682bcb976d 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -152,7 +152,6 @@ production: &base ## Gravatar ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html gravatar: - enabled: true # Use user avatar image from Gravatar.com (default: true) # gravatar urls: possible placeholders: %{hash} %{size} %{email} # plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon |