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/devise.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/devise.rb')
| -rw-r--r-- | config/initializers/devise.rb | 2 |
1 files changed, 0 insertions, 2 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 |