diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-25 12:24:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-25 12:24:33 +0000 |
| commit | d772f52e1ec5848b00fc590606d33645f0799eb5 (patch) | |
| tree | df516057bab79e8ee01707e50ee70f05cc48231c /config | |
| parent | 7ea8ea8e1a214bf622b27867300ffb25887d2b7f (diff) | |
| parent | 85940d766a30edb707b3e5154f38ae90c935e0a2 (diff) | |
| download | gitlab-ce-d772f52e1ec5848b00fc590606d33645f0799eb5.tar.gz | |
Merge branch 'default-to-https-for-gravatar-urls' into 'master'
Default to HTTPS for all Gravatar URLs
See merge request gitlab-org/gitlab-ce!16666
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 8 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index f2f05b3eeb2..238e1583770 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -175,10 +175,12 @@ production: &base host: 'https://mattermost.example.com' ## Gravatar - ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html + ## If using gravatar.com, there's nothing to change here. For Libravatar + ## you'll need to provide the custom URLs. For more information, + ## see: https://docs.gitlab.com/ee/customization/libravatar.html gravatar: - # gravatar urls: possible placeholders: %{hash} %{size} %{email} %{username} - # plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon + # Gravatar/Libravatar URLs: possible placeholders: %{hash} %{size} %{email} %{username} + # plain_url: "http://..." # default: https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon ## Auxiliary jobs diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index abc992e49dc..899e612ffbd 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -350,7 +350,7 @@ Settings.mattermost['host'] = nil unless Settings.mattermost.enabled # 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=identicon' +Settings.gravatar['plain_url'] ||= 'https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon' Settings.gravatar['ssl_url'] ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon' Settings.gravatar['host'] = Settings.host_without_www(Settings.gravatar['plain_url']) |