diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-26 20:16:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-26 20:16:31 +0100 |
| commit | cfa92c4ec025609c24c24d73114033ecf150a438 (patch) | |
| tree | af42722e4bdef8f4fcc4a43268e8ef033bf38a81 /app/models/status.rb | |
| parent | 20abef6590505d12aca81ed1c386804d75b8b552 (diff) | |
| parent | fad6633156cae8ab2a7bad0c9802cf7918964ef4 (diff) | |
Merge pull request #2095 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 } |