From ef31ea6b965f2955983429c7de784e3c2db6234a Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Thu, 6 Jun 2019 02:19:17 +0200
Subject: [PATCH] Enable remember me for all forms

fixes #8023
---
 app/models/user.rb                   | 4 ++++
 app/views/devise/passwords/edit.haml | 1 -
 app/views/sessions/_form.haml        | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 8d30efa97..8ab4f9be6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -591,6 +591,10 @@ class User < ApplicationRecord
     end
   end
 
+  def remember_me
+    true
+  end
+
   private
 
   def clearable_fields
diff --git a/app/views/devise/passwords/edit.haml b/app/views/devise/passwords/edit.haml
index 126ae62f4..28e2126ea 100644
--- a/app/views/devise/passwords/edit.haml
+++ b/app/views/devise/passwords/edit.haml
@@ -37,7 +37,6 @@
                            autocorrect:    "off",
                            aria:           {labelledby: "passwordConfirmationLabel"}
 
-      = hidden_field(:user, :remember_me, value: 1)
       = f.submit t("devise.passwords.edit.change_password"), class: "btn btn-block btn-primary"
 
     .text-center
diff --git a/app/views/sessions/_form.haml b/app/views/sessions/_form.haml
index ba56cbf04..a4e608386 100644
--- a/app/views/sessions/_form.haml
+++ b/app/views/sessions/_form.haml
@@ -40,5 +40,4 @@
                        autocorrect: "off",
                        aria: {labelledby: "passwordLabel"}
 
-  = f.hidden_field :remember_me, value: 1
   = f.submit t("devise.sessions.new.sign_in"), class: "btn btn-large btn-block btn-primary"