From a69f9b6f2ba3446ed63ffa575388ae5ada6df18e Mon Sep 17 00:00:00 2001
From: Peter David Hamilton <pete@peterdavidhamilton.com>
Date: Wed, 25 Oct 2023 14:44:21 +0100
Subject: [PATCH] Use action_dispatch instead of devise

---
 config/environments/production.rb | 3 +++
 config/initializers/devise.rb     | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index a6e4c8c4a..8b3ec98e1 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -46,6 +46,9 @@
     'X-Robots-Tag' => ('none' unless Rails.application.live?),
   }.compact
 
+  # Contentful Live-Preview of secured pages
+  config.action_dispatch.cookies_same_site_protection = :none
+
   # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
 
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 23d00c3a2..f7ca631b4 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -214,10 +214,7 @@ def i18n_message(default = nil)
 
   # Options to be passed to the created cookie. For instance, you can set
   # secure: true in order to force SSL only cookies.
-  config.rememberable_options = {
-    same_site: :none,
-    secure: true,
-  }
+  # config.rememberable_options = {}
 
   # ==> Configuration for :validatable
   # Range for password length.