diff options
| author | Jean-Luc Geering <jeanluc.geering@ufirstgroup.com> | 2013-05-31 10:30:21 +0200 |
|---|---|---|
| committer | Jean-Luc Geering <jeanluc.geering@ufirstgroup.com> | 2013-05-31 10:30:21 +0200 |
| commit | 57497e9f25aca0f49b079b03626ef99fde279520 (patch) | |
| tree | 23a2895cc0785e22f6e434a5836cdb7f7528bf5c /app/controllers/application_controller.rb | |
| parent | ee2124b7e935bb8bbe7a33c1a276efa296311b28 (diff) | |
| download | gitlab-ce-57497e9f25aca0f49b079b03626ef99fde279520.tar.gz | |
enforce secure gravatar urls when Gitlab.config.gitlab.https is set
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9bb86b80d1e..27b49e1b3cf 100644 --- 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 |