Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-06-01 20:19:17 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-06-01 20:19:17 +0300
commit97d6085fb507d53f92699d5cfea06dd319125994 (patch)
tree37a7de6bafde1c71e40a83d8615f0d23da4d90c0 /doc
parent950db1bd6472813bb539b69a309402c4eb115122 (diff)
parentdcd002a15bd9a3efee7b75de17c0f6d303c2a009 (diff)
Merge branch 'dm-gravatar-username' into 'master'
Add username parameter to gravatar URL Closes #24472 See merge request !11741
Diffstat (limited to 'doc')
-rw-r--r--doc/customization/libravatar.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/customization/libravatar.md b/doc/customization/libravatar.md
index c46ce2ee203..9bd22d3966d 100644
--- a/doc/customization/libravatar.md
+++ b/doc/customization/libravatar.md
@@ -16,7 +16,7 @@ the configuration options as follows:
```yml
gravatar:
enabled: true
- # gravatar URLs: possible placeholders: %{hash} %{size} %{email}
+ # gravatar URLs: possible placeholders: %{hash} %{size} %{email} %{username}
plain_url: "http://cdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon"
```
@@ -25,7 +25,7 @@ the configuration options as follows:
```yml
gravatar:
enabled: true
- # gravatar URLs: possible placeholders: %{hash} %{size} %{email}
+ # gravatar URLs: possible placeholders: %{hash} %{size} %{email} %{username}
ssl_url: "https://seccdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon"
```