Merge remote-tracking branch 'upstream/main'

This commit is contained in:
bgme 2022-02-03 22:11:25 +08:00
commit 30a67d2421
11 changed files with 294 additions and 58 deletions

View file

@ -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