Merge pull request #3625 from chr1831/master

Use secure Gravatar url when https is set to true in the configuration

Merge pull request #3625 from chr1831/master
b20bd1b6 · Dmitriy Zaporozhets · a8557183 · 1a92ae9f · b20bd1b6
Commit b20bd1b6 authored Apr 19, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

application_helper.rb app/helpers/application_helper.rb +1 -1

No files found.
--- 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