Download as
Browse Code »

Commit 7be80fd89954a248527ca9be4bb9d9c320390811

Authored by Dmitriy Zaporozhets
1 parent 085a93d4
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Enable identicon for gravatar by default 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 5 additions and 4 deletions   Show diff stats
@@ -38,6 +38,7 @@ v 7.0.0 @@ -38,6 +38,7 @@ v 7.0.0
38 - Dont expose user emails via API unless you are admin 38 - Dont expose user emails via API unless you are admin
39 - Detect issues closed by Merge Request description 39 - Detect issues closed by Merge Request description
40 - Better email subject lines from email on push service (Alex Elman) 40 - Better email subject lines from email on push service (Alex Elman)
  41 + - Enable identicon for gravatar be default
41 42
42 v 6.9.2 43 v 6.9.2
43 - Revert the commit that broke the LDAP user filter 44 - Revert the commit that broke the LDAP user filter
config/gitlab.yml.example
  Diff comments   View file @7be80fd
@@ -114,8 +114,8 @@ production: &amp;base @@ -114,8 +114,8 @@ production: &amp;base
114 gravatar: 114 gravatar:
115 enabled: true # Use user avatar image from Gravatar.com (default: true) 115 enabled: true # Use user avatar image from Gravatar.com (default: true)
116 # gravatar urls: possible placeholders: %{hash} %{size} %{email} 116 # gravatar urls: possible placeholders: %{hash} %{size} %{email}
117 - # plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm  
118 - # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm 117 + # plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
  118 + # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
119 119
120 # 120 #
121 # 2. Auth settings 121 # 2. Auth settings
config/initializers/1_settings.rb
  Diff comments   View file @7be80fd
@@ -104,8 +104,8 @@ Settings.gitlab[&#39;repository_downloads_path&#39;] = File.absolute_path(Settings.gitla @@ -104,8 +104,8 @@ Settings.gitlab[&#39;repository_downloads_path&#39;] = File.absolute_path(Settings.gitla
104 # 104 #
105 Settings['gravatar'] ||= Settingslogic.new({}) 105 Settings['gravatar'] ||= Settingslogic.new({})
106 Settings.gravatar['enabled'] = true if Settings.gravatar['enabled'].nil? 106 Settings.gravatar['enabled'] = true if Settings.gravatar['enabled'].nil?
107 -Settings.gravatar['plain_url'] ||= 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'  
108 -Settings.gravatar['ssl_url'] ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm' 107 +Settings.gravatar['plain_url'] ||= 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
  108 +Settings.gravatar['ssl_url'] ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
109 109
110 # 110 #
111 # GitLab Shell 111 # GitLab Shell