Commit b20bd1b6055b1dd9825ca86e78d056c7a32d7f69
Exists in
master
and in
4 other branches
Merge pull request #3625 from chr1831/master
Use secure Gravatar url when https is set to true in the configuration
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
app/helpers/application_helper.rb
| @@ -37,7 +37,7 @@ module ApplicationHelper | @@ -37,7 +37,7 @@ module ApplicationHelper | ||
| 37 | if !Gitlab.config.gravatar.enabled || user_email.blank? | 37 | if !Gitlab.config.gravatar.enabled || user_email.blank? |
| 38 | 'no_avatar.png' | 38 | 'no_avatar.png' |
| 39 | else | 39 | else |
| 40 | - gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url | 40 | + gravatar_url = request.ssl? || Gitlab.config.gitlab.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url |
| 41 | user_email.strip! | 41 | user_email.strip! |
| 42 | sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size | 42 | sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size |
| 43 | end | 43 | end |