gyiang
/
gitlab
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'email_in_gravatar_urls' into 'master' 

allow passing user's email address in custom Gravatar urls

Some custom avatar systems use the user's email address rather than its hash. This merge request will allow the administrator to configure gitlab-ce to use the user's email address gravatar.plain_url and  gravatar.ssl_url in the config file like this:

```
gravatar:
    enabled: true
    plain_url: "http://company.com/avatar/?mail=%{email}&size=%{size}"
    ssl_url: "https://company.com/avatar/?mail=%{email}&size=%{size}"
```

It's a only a 2 word patch.
This commit is contained in:
Dmitriy Zaporozhets 2014-04-23 08:52:15 +00:00
parent 972e40cc47 ca19260812
commit 3295a4db9d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -75,7 +75,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

1
config/gitlab.yml.example
View File

@ -117,6 +117,7 @@ production: &base
## Gravatar
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=mm
# ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm