Merge tag 'v2.6.0rc1' into instance_only_statuses

2018-10-23 08:32:55 +02:00
parent d42a06fc74 f468bfb830
commit fde9668bae
570 changed files with 11506 additions and 5693 deletions
--- a/app/models/stream_entry.rb
+++ b/app/models/stream_entry.rb
@ -49,7 +49,7 @@ class StreamEntry < ApplicationRecord
  end

  def mentions
-    orphaned? ? [] : status.mentions.map(&:account)
+    orphaned? ? [] : status.active_mentions.map(&:account)
  end

  private