Commit 5d7bdf76 authored by Arnaud ABELARD's avatar Arnaud ABELARD

allow using the user's email address as a http parameter in gravatar urls for...

allow using the user's email address as a http parameter in gravatar urls for custom avatar systems. For example:
plain_url: "http://avatar.company.com/avatar/?mail=%{email}&size=%{size}"

add mention of the different placeholders possible for gravatar urls, mentionning the new %{email}
parent 0f31acd0
...@@ -75,7 +75,7 @@ module ApplicationHelper ...@@ -75,7 +75,7 @@ module ApplicationHelper
else else
gravatar_url = request.ssl? || gitlab_config.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url gravatar_url = request.ssl? || gitlab_config.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
user_email.strip! user_email.strip!
sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size, email: user_email
end end
end end
......
...@@ -117,6 +117,7 @@ production: &base ...@@ -117,6 +117,7 @@ production: &base
## Gravatar ## Gravatar
gravatar: gravatar:
enabled: true # Use user avatar image from Gravatar.com (default: true) 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 # 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 # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment