Merge main into bundle-emails branch
This commit is contained in:
+2
-2
@@ -1,6 +1,6 @@
|
||||
class User < ApplicationRecord
|
||||
include Accessor, Attachable, Assignee, Configurable, Mentionable, Named, Notifiable, Role,
|
||||
Searcher, SignalUser, Staff, Transferable, Conversational, AiQuota
|
||||
include Accessor, AiQuota, Assignee, Attachable, Configurable, Conversational, Mentionable, Named,
|
||||
Notifiable, Role, Searcher, SignalUser, Staff, Transferable
|
||||
include Timelined # Depends on Accessor
|
||||
|
||||
has_one_attached :avatar
|
||||
|
||||
Reference in New Issue
Block a user