diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-11 07:07:51 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-11 07:07:51 -0700 |
| commit | 159eee8dfde049b571172ee3594cf8c920b0fc10 (patch) | |
| tree | 4db27e3acca2af8cf685d30b6454b0a50e2d31af | |
| parent | 3816387cc95098632c9acbafb516e2cde0d9fee7 (diff) | |
| parent | 57497e9f25aca0f49b079b03626ef99fde279520 (diff) | |
| download | gitlab-ce-159eee8dfde049b571172ee3594cf8c920b0fc10.tar.gz | |
Merge pull request #4148 from jlgeering/secure-gravatar-urls
enforce secure gravatar urls when Gitlab.config.gitlab.https is set
| -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 |