diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-01-16 14:20:07 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-16 14:20:07 +0100 |
commit | dbe311f0e97a79f7530c7fe10bcee8b9c70b9904 (patch) | |
tree | eb42d152d7204d4f109aee195037d82afd842b16 /config/initializers/session_store.rb | |
parent | 077639c27409f897e87522dd18a51801b6cbc40d (diff) | |
parent | 5363c724fc33e441cd4be22ba0e757b1ac4fd401 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/simple_form.pl.yml
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 c0757b6b5..3dc0edd6f 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'), same_site: :lax +Rails.application.config.session_store :cookie_store, key: '_mastodon_session', secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true') |