about summary refs log tree commit diff
path: root/config/initializers/session_store.rb
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-11-12 17:42:53 -0600
committerFire Demon <firedemon@creature.cafe>2020-11-14 17:39:08 -0600
commitf60e0b62f4e5300645f235983e5b75bcf16b370d (patch)
tree0c437e6600b7a8bdf806d63fa76ce751bbe66d58 /config/initializers/session_store.rb
parentec3abd7c87116ad2df5b1da5701afe68a7f74844 (diff)
parent265b26489a9214a6c98a4dfa88f08ce490211ebc (diff)
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'config/initializers/session_store.rb')
-rw-r--r--config/initializers/session_store.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 3dc0edd6f..e5d1be4c6 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,7 @@
 # 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,
+}