diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
| commit | 9adeaf2bfc1c16ca70e611b5288886b21414217b (patch) | |
| tree | 53372bc9bd6f38d158aad50c768e18773b7d3f3b /app/lib/inline_renderer.rb | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | 4bae4e972d43f71bffb888ac82c180b2fa3f1ada (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
Diffstat (limited to 'app/lib/inline_renderer.rb')
| -rw-r--r-- | app/lib/inline_renderer.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb index 761a8822d..27e334a4d 100644 --- a/app/lib/inline_renderer.rb +++ b/app/lib/inline_renderer.rb @@ -15,6 +15,10 @@ class InlineRenderer serializer = REST::NotificationSerializer when :conversation serializer = REST::ConversationSerializer + when :announcement + serializer = REST::AnnouncementSerializer + when :reaction + serializer = REST::ReactionSerializer else return end |