diff options
| author | ThibG <thib@sitedethib.com> | 2018-09-11 20:09:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 20:09:00 +0200 |
| commit | 82b521b4c306d75530795bce9f6c706359e7339e (patch) | |
| tree | 4ac730d5c48dfd27703e33ffab034e3266f7e0ad /config/initializers/session_store.rb | |
| parent | 59de2868c13a61bce08923f841024fefebe3b3da (diff) | |
| parent | f1214f00d990612229c753d8657944a10b9bf8a1 (diff) | |
Merge pull request #724 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers/session_store.rb')
| -rw-r--r-- | config/initializers/session_store.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 3dc0edd6f..c0757b6b5 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cookie_store, key: '_mastodon_session', secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true') +Rails.application.config.session_store :cookie_store, key: '_mastodon_session', secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'), same_site: :lax |