about summary refs log tree commit diff
path: root/config/initializers/devise.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-09-11 20:09:00 +0200
committerGitHub <noreply@github.com>2018-09-11 20:09:00 +0200
commit82b521b4c306d75530795bce9f6c706359e7339e (patch)
tree4ac730d5c48dfd27703e33ffab034e3266f7e0ad /config/initializers/devise.rb
parent59de2868c13a61bce08923f841024fefebe3b3da (diff)
parentf1214f00d990612229c753d8657944a10b9bf8a1 (diff)
Merge pull request #724 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers/devise.rb')
-rw-r--r--config/initializers/devise.rb2
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