summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Abélard <arnaud@abelard.fr>2014-01-11 09:54:05 +0000
committerArnaud Abélard <arnaud@abelard.fr>2014-01-11 09:54:05 +0000
commit32499e8276c936ddc0a3c951413b6f73cbdae00c (patch)
tree366b53b2cf7ac645c1976f7042594a53781d66ff
parent12dbd0a4137546026a7a1f606510627f262d6dc0 (diff)
downloadgitlab-ce-32499e8276c936ddc0a3c951413b6f73cbdae00c.tar.gz
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}"
-rw-r--r--app/helpers/application_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0db43fa1809..354bdd8e42e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -66,7 +66,7 @@ module ApplicationHelper
else
gravatar_url = request.ssl? || gitlab_config.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
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
@@ -221,4 +221,4 @@ module ApplicationHelper
def render_markup(file_name, file_content)
GitHub::Markup.render(file_name, file_content).html_safe
end
-end
+end \ No newline at end of file