about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-03-19 20:17:18 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-03-19 20:17:18 +0000
commitdf70571bfe8aa18cfb44661fb02cc1e2e256c4e8 (patch)
treecf6269fa490b4533999d68acb969a1a86447666b /app/lib
parentab04be2f84132e6b6a83ca86cbabf2cdf13f5894 (diff)
parentff6b8a6443c2c97d185927053bdc8816e0e03434 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/ostatus/atom_serializer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/ostatus/atom_serializer.rb b/app/lib/ostatus/atom_serializer.rb
index 656e45822..46d0a8b37 100644
--- a/app/lib/ostatus/atom_serializer.rb
+++ b/app/lib/ostatus/atom_serializer.rb
@@ -351,7 +351,7 @@ class OStatus::AtomSerializer
     append_element(entry, 'summary', status.spoiler_text, 'xml:lang': status.language) if status.spoiler_text?
     append_element(entry, 'content', Formatter.instance.format(status).to_str, type: 'html', 'xml:lang': status.language)
 
-    status.mentions.each do |mentioned|
+    status.mentions.order(:id).each do |mentioned|
       append_element(entry, 'link', nil, rel: :mentioned, 'ostatus:object-type': OStatus::TagManager::TYPES[:person], href: OStatus::TagManager.instance.uri_for(mentioned.account))
     end