diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-19 15:41:59 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-19 15:41:59 -0500 |
| commit | 0fa0836e63674104cea5095c5336bab8587d8634 (patch) | |
| tree | bcafd10ffe52f32b95c470c59bdb83309a0f6ce9 /app/serializers/activitypub/note_serializer.rb | |
| parent | c074b226b68d81b0503f935dc81b74cd11b11d67 (diff) | |
| parent | df70571bfe8aa18cfb44661fb02cc1e2e256c4e8 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/serializers/activitypub/note_serializer.rb')
| -rw-r--r-- | app/serializers/activitypub/note_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index d0e6290c1..abaf29047 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -57,7 +57,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer end def virtual_tags - object.mentions + object.tags + object.emojis + object.mentions.order(:id) + object.tags + object.emojis end def atom_uri |