Merge pull request #4148 from jlgeering/secure-gravatar-urls

enforce secure gravatar urls when Gitlab.config.gitlab.https is set

Merge pull request #4148 from jlgeering/secure-gravatar-urls
159eee8d · Dmitriy Zaporozhets · 3816387c · 57497e9f · 159eee8d
Commit 159eee8d authored Jun 11, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

application_controller.rb app/controllers/application_controller.rb +1 -1

No files found.
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -154,7 +154,7 @@ class ApplicationController < ActionController::Base
    gon.default_issues_tracker = Project.issues_tracker.default_value
    gon.api_version = API::API.version
    gon.api_token = current_user.private_token if current_user
-    gon.gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
+    gon.gravatar_url = request.ssl? || Gitlab.config.gitlab.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
    gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
  end
 end