Merge branch 'main' into glitch-soc/merge-upstream

2022-02-01 20:59:28 +01:00 · 2022-02-01 20:59:28 +01:00 · 098f2bc1e1
commit 098f2bc1e1
parent d6f3261c6c d0d15bf49c
5 changed files with 34 additions and 3 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -45,6 +45,8 @@ class User < ApplicationRecord
  self.ignored_columns = %w(
    remember_created_at
    remember_token
+    current_sign_in_ip
+    last_sign_in_ip
  )

  include Settings::Extend