diff options
| author | Sylas <sylas@debian> | 2013-04-17 21:34:08 -0700 |
|---|---|---|
| committer | Sylas <sylas@debian> | 2013-04-17 21:34:08 -0700 |
| commit | 1a92ae9fcb1e25579f8cd65b6c9683d193a97455 (patch) | |
| tree | 06ed19c4dc3550b6dbe45168c45640529e0ddc97 | |
| parent | 26befdc717f4389883755a0bb83d2c94e23bc459 (diff) | |
| download | gitlab-ce-1a92ae9fcb1e25579f8cd65b6c9683d193a97455.tar.gz | |
Override gravatar url to use SSL if gitlab has the SSL flag set to true.
| -rw-r--r-- | app/helpers/application_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 387172b5804..61eb8271d1b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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 |