mirror of
https://github.com/yingziwu/mastodon.git
synced 2026-02-22 02:03:18 +00:00
Merge remote-tracking branch 'upstream/main'
This commit is contained in:
commit
30a67d2421
11 changed files with 294 additions and 58 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue