Commit c797493e00bf3adf32beb0c0b1cee9d19974485f
Exists in
spb-stable
and in
3 other branches
Merge branch 'session_store' of /home/git/repositories/gitlab/gitlabhq
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
config/initializers/session_store.rb
| @@ -4,7 +4,7 @@ Gitlab::Application.config.session_store( | @@ -4,7 +4,7 @@ Gitlab::Application.config.session_store( | ||
| 4 | :redis_store, # Using the cookie_store would enable session replay attacks. | 4 | :redis_store, # Using the cookie_store would enable session replay attacks. |
| 5 | servers: Gitlab::Application.config.cache_store.last, # re-use the Redis config from the Rails cache store | 5 | servers: Gitlab::Application.config.cache_store.last, # re-use the Redis config from the Rails cache store |
| 6 | key: '_gitlab_session', | 6 | key: '_gitlab_session', |
| 7 | - secure: Gitlab::Application.config.force_ssl, | 7 | + secure: Gitlab.config.gitlab.https, |
| 8 | httponly: true, | 8 | httponly: true, |
| 9 | path: (Rails.application.config.relative_url_root.nil?) ? '/' : Rails.application.config.relative_url_root | 9 | path: (Rails.application.config.relative_url_root.nil?) ? '/' : Rails.application.config.relative_url_root |
| 10 | ) | 10 | ) |