Enable identicon for gravatar by default

Signed-off-by: Dmitriy Zaporozhets <[email protected]>
Undev · Jun 17, 2014 · 7be80fd · 7be80fd
1 parent 085a93d
commit 7be80fd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -38,6 +38,7 @@ v 7.0.0
   - Dont expose user emails via API unless you are admin 
   - Detect issues closed by Merge Request description
   - Better email subject lines from email on push service (Alex Elman)
+  - Enable identicon for gravatar be default
 
 v 6.9.2
   - Revert the commit that broke the LDAP user filter

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
@@ -114,8 +114,8 @@ production: &base
   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=mm
-    # ssl_url:   "https://..."    # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
+    # 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
 
   #
   # 2. Auth settings

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
@@ -104,8 +104,8 @@ def verify_constant(modul, current, default)
 #
 Settings['gravatar'] ||= Settingslogic.new({})
 Settings.gravatar['enabled']      = true if Settings.gravatar['enabled'].nil?
-Settings.gravatar['plain_url']  ||= 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
-Settings.gravatar['ssl_url']    ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
+Settings.gravatar['plain_url']  ||= 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
+Settings.gravatar['ssl_url']    ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
 
 #
 # GitLab Shell