diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-16 16:28:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 16:28:38 +0100 |
| commit | 530d29148ca0c5bf29f6fa516b1ef4f91d95894b (patch) | |
| tree | e074e7b778e973b12e754d939cc5e2805eb012d6 /config/initializers | |
| parent | 077639c27409f897e87522dd18a51801b6cbc40d (diff) | |
| parent | 5684cd090caec27729d78c204911348a0cf62cbf (diff) | |
Merge pull request #887 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/devise.rb | 2 | ||||
| -rw-r--r-- | config/initializers/session_store.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 3e4c9a79d..cd9bacf68 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -10,7 +10,6 @@ Warden::Manager.after_set_user except: :fetch do |user, warden| expires: 1.year.from_now, httponly: true, secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'), - same_site: :lax, } end @@ -21,7 +20,6 @@ Warden::Manager.after_fetch do |user, warden| expires: 1.year.from_now, httponly: true, secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'), - same_site: :lax, } else warden.logout 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') |