diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-24 11:28:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 11:28:25 +0200 |
| commit | 0e8de56a22aee089da8aa1c64bab941bc5911e5d (patch) | |
| tree | ac3f4100e27a9341c32c15e07661af841c547ec0 /app/services/remove_status_service.rb | |
| parent | 4739e0f090a04235669ef81fa432ae90bb62f4c4 (diff) | |
| parent | ed8d06212f439b9fe2f170a6f43d6be6d586ff80 (diff) | |
Merge pull request #792 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/remove_status_service.rb')
| -rw-r--r-- | app/services/remove_status_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 1a53093b8..4bee86c8a 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -8,7 +8,7 @@ class RemoveStatusService < BaseService @status = status @account = status.account @tags = status.tags.pluck(:name).to_a - @mentions = status.mentions.includes(:account).to_a + @mentions = status.active_mentions.includes(:account).to_a @reblogs = status.reblogs.to_a @stream_entry = status.stream_entry @options = options |