about summary refs log tree commit diff
path: root/config/initializers/devise.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-04-08 22:24:07 +0200
committerGitHub <noreply@github.com>2022-04-08 22:24:07 +0200
commitc483101b4ae7d9f22ea43921c512f479e16e98ca (patch)
tree1de88394686dd7f532e7ddf68a9023caa1bfdb88 /config/initializers/devise.rb
parente0c39f9fad837b77373220515f078f2443ddf553 (diff)
parenta8d89aabb2292af499f2d1392ad435dd261dd41b (diff)
Merge pull request #1737 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers/devise.rb')
-rw-r--r--config/initializers/devise.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index b434c68fa..c55bea7a7 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -8,7 +8,6 @@ Warden::Manager.after_set_user except: :fetch do |user, warden|
     value: session_id,
     expires: 1.year.from_now,
     httponly: true,
-    secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
     same_site: :lax,
   }
 end
@@ -23,7 +22,6 @@ Warden::Manager.after_fetch do |user, warden|
       value: session_id,
       expires: 1.year.from_now,
       httponly: true,
-      secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
       same_site: :lax,
     }
   else
@@ -265,7 +263,7 @@ Devise.setup do |config|
 
   # 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 = { secure: true }
+  config.rememberable_options = {}
 
   # ==> Configuration for :validatable
   # Range for password length.