Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00
parent 3023725936 88627fd7aa
commit 35fbdc36f9
230 changed files with 8548 additions and 567 deletions
--- a/app/models/stream_entry.rb
+++ b/app/models/stream_entry.rb
@@ -27,7 +27,7 @@ class StreamEntry < ApplicationRecord
  scope :recent, -> { reorder(id: :desc) }
  scope :with_includes, -> { includes(:account, status: STATUS_INCLUDES) }

-  delegate :target, :title, :content, :thread,
+  delegate :target, :title, :content, :thread, :local_only?,
           to: :status,
           allow_nil: true