Merge pull request #3625 from chr1831/master

Use secure Gravatar url when https is set to true in the configuration
gitlabhq · Apr 19, 2013 · b20bd1b · b20bd1b
2 parents a855718 + 1a92ae9
commit b20bd1b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -37,7 +37,7 @@ def gravatar_icon(user_email = '', size = nil)
     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