diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-01 17:19:17 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-01 17:19:17 +0000 |
| commit | 97d6085fb507d53f92699d5cfea06dd319125994 (patch) | |
| tree | 37a7de6bafde1c71e40a83d8615f0d23da4d90c0 /config | |
| parent | 950db1bd6472813bb539b69a309402c4eb115122 (diff) | |
| parent | dcd002a15bd9a3efee7b75de17c0f6d303c2a009 (diff) | |
| download | gitlab-ce-97d6085fb507d53f92699d5cfea06dd319125994.tar.gz | |
Merge branch 'dm-gravatar-username' into 'master'
Add username parameter to gravatar URL
Closes #24472
See merge request !11741
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 6c1c1f8c041..d2aeb66ebf6 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -169,7 +169,7 @@ production: &base ## Gravatar ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html gravatar: - # gravatar urls: possible placeholders: %{hash} %{size} %{email} + # gravatar urls: possible placeholders: %{hash} %{size} %{email} %{username} # 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 |