Merge pull request #3625 from chr1831/master
Use secure Gravatar url when https is set to true in the configuration
This commit is contained in:
commit
b20bd1b605
1 changed files with 1 additions and 1 deletions
|
@ -37,7 +37,7 @@ module ApplicationHelper
|
|||
if !Gitlab.config.gravatar.enabled || user_email.blank?
|
||||
'no_avatar.png'
|
||||
else
|
||||
gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
|
||||
gravatar_url = request.ssl? || Gitlab.config.gitlab.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
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue