diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-26 19:31:39 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-26 19:31:39 +0100 |
| commit | fad6633156cae8ab2a7bad0c9802cf7918964ef4 (patch) | |
| tree | bacf2c029e83fcdc93a9223d57fc4319c4c0872e /app/models/status.rb | |
| parent | 7acf26e7778f8bb2b62c61904547dec75723c203 (diff) | |
| parent | 13a2abacc8f943e2b1d2da63551443887e1065b0 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 14b7a39fe..4e4d960a4 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -122,7 +122,7 @@ class Status < ApplicationRecord :tags, :preview_cards, :preloadable_poll, - account: [:account_stat, :user], + account: [:account_stat, user: :role], active_mentions: { account: :account_stat }, reblog: [ :application, @@ -132,7 +132,7 @@ class Status < ApplicationRecord :conversation, :status_stat, :preloadable_poll, - account: [:account_stat, :user], + account: [:account_stat, user: :role], active_mentions: { account: :account_stat }, ], thread: { account: :account_stat } |