BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 159eee8d by Dmitriy Zaporozhets
Options

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

enforce secure gravatar urls when Gitlab.config.gitlab.https is set
parents 3816387c 57497e9f
Showing with 1 addition and 1 deletion
app/controllers/application_controller.rb
...@@ -154,7 +154,7 @@ class ApplicationController < ActionController::Base ...@@ -154,7 +154,7 @@ class ApplicationController < ActionController::Base
gon.default_issues_tracker = Project.issues_tracker.default_value gon.default_issues_tracker = Project.issues_tracker.default_value
gon.api_version = API::API.version gon.api_version = API::API.version
gon.api_token = current_user.private_token if current_user 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 gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
end end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment