diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 20:21:02 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 20:21:02 +0300 |
| commit | 71da2e0b56a89fc87f2da3685bdebb333690593a (patch) | |
| tree | be6418658f118746ab158be162622fe8cb5f0b0e /config/gitlab.yml.example | |
| parent | 011a905a821e2ff0cd2d9885ef93764018eb8346 (diff) | |
| parent | 44501820152083d231459223fe09b9d9641b7c1e (diff) | |
| download | gitlab-ce-71da2e0b56a89fc87f2da3685bdebb333690593a.tar.gz | |
Merge remote-tracking branch 'origin/master' into docker-registry
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index e55ca6f9c6b..cbb7c656fe7 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -152,7 +152,6 @@ production: &base ## Gravatar ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html 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=identicon # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon |