Download as
Browse Code »

Commit 57497e9f25aca0f49b079b03626ef99fde279520

Authored by Jean-Luc Geering
1 parent ee2124b7
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
  Diff comments   View file @57497e9
@@ -154,7 +154,7 @@ class ApplicationController < ActionController::Base @@ -154,7 +154,7 @@ class ApplicationController < ActionController::Base
154 gon.default_issues_tracker = Project.issues_tracker.default_value 154 gon.default_issues_tracker = Project.issues_tracker.default_value
155 gon.api_version = API::API.version 155 gon.api_version = API::API.version
156 gon.api_token = current_user.private_token if current_user 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 gon.relative_url_root = Gitlab.config.gitlab.relative_url_root 158 gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
159 end 159 end
160 end 160 end