Merge tag 'v3.0.1' into hometown-dev

2019-11-07 10:11:39 -08:00
parent b2b108a09a c4118ba71b
commit 4f18400f90
194 changed files with 2509 additions and 1408 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -291,10 +291,6 @@ class Status < ApplicationRecord
      where(language: nil).or where(language: account.chosen_languages)
    end

-    def as_home_timeline(account)
-      where(account: [account] + account.following).where(visibility: [:public, :unlisted, :private])
-    end
-
    def as_public_timeline(account = nil, local_only = false)
      query = timeline_scope(local_only).without_replies