diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-17 09:27:50 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-17 09:27:50 +0300 |
| commit | 7be80fd89954a248527ca9be4bb9d9c320390811 (patch) | |
| tree | 3bad7cc45e183d0df7c89397404f1307a4311cc8 /config | |
| parent | 085a93d4a513dd661d57f2a9a5141e2c6b5680a2 (diff) | |
| download | gitlab-ce-7be80fd89954a248527ca9be4bb9d9c320390811.tar.gz | |
Enable identicon for gravatar by default
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 50a1a78b504..806984e8d40 100644 --- 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 index de7c0990c09..f55e69c08f6 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -104,8 +104,8 @@ Settings.gitlab['repository_downloads_path'] = File.absolute_path(Settings.gitla # 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 |