diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-19 12:56:57 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-19 12:56:57 -0700 |
| commit | b20bd1b6055b1dd9825ca86e78d056c7a32d7f69 (patch) | |
| tree | 245ccc6812d5a58f1c9eb321549b42e22f61560b | |
| parent | a855718341bfc96379127fb8cb583830f1c9c01f (diff) | |
| parent | 1a92ae9fcb1e25579f8cd65b6c9683d193a97455 (diff) | |
| download | gitlab-ce-b20bd1b6055b1dd9825ca86e78d056c7a32d7f69.tar.gz | |
Merge pull request #3625 from chr1831/master
Use secure Gravatar url when https is set to true in the configuration
| -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 a32e6958823..6b3f0053f12 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 |