Commit 57497e9f25aca0f49b079b03626ef99fde279520
1 parent
ee2124b7
Exists in
master
and in
4 other branches
enforce secure gravatar urls when Gitlab.config.gitlab.https is set
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
app/controllers/application_controller.rb
| ... | ... | @@ -154,7 +154,7 @@ class ApplicationController < ActionController::Base |
| 154 | 154 | gon.default_issues_tracker = Project.issues_tracker.default_value |
| 155 | 155 | gon.api_version = API::API.version |
| 156 | 156 | gon.api_token = current_user.private_token if current_user |
| 157 | - gon.gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url | |
| 157 | + gon.gravatar_url = request.ssl? || Gitlab.config.gitlab.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url | |
| 158 | 158 | gon.relative_url_root = Gitlab.config.gitlab.relative_url_root |
| 159 | 159 | end |
| 160 | 160 | end | ... | ... |