diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-09-11 16:51:26 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-11 16:51:26 +0200 |
commit | cd99255698354f3b5ec1c0d5d9bc1b4fb9bffdf3 (patch) | |
tree | 0486b73191a98645e0620fefe8743f4a0c44bef5 /config/initializers/devise.rb | |
parent | 65f625cf237feb55a21495606d5e2c258bbe50cc (diff) | |
parent | bda0f7ac7353a63b42ca99b2e7d4e80a3b03b850 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.
Diffstat (limited to 'config/initializers/devise.rb')
-rw-r--r-- | config/initializers/devise.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index cd9bacf68..3e4c9a79d 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -10,6 +10,7 @@ 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 @@ -20,6 +21,7 @@ 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 |