about summary refs log tree commit diff
path: root/app/models/status.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-01-31 22:34:33 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-01-31 22:35:38 +0100
commitbf60f2898d8c9dcf880bd14c187caf90b9549a2a (patch)
tree75a887258dc5e8247cd22091f1631a43efa1597c /app/models/status.rb
parent8ef79d8dc9de33975bd793587020a259ef020276 (diff)
Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI
Diffstat (limited to 'app/models/status.rb')
-rw-r--r--app/models/status.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 651d0dbc9..99e167bc9 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -119,7 +119,6 @@ class Status < ApplicationRecord
       query = tag.statuses
                  .joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
                  .where(visibility: :public)
-                 .where('(statuses.in_reply_to_id IS NULL OR statuses.in_reply_to_account_id = statuses.account_id)')
                  .where('statuses.reblog_of_id IS NULL')
 
       account.nil? ? filter_timeline_default(query) : filter_timeline_default(filter_timeline(query, account))