Merge git://github.com/tootsuite/mastodon into tootsuite-master

2017-07-25 21:36:22 +02:00
parent 852acbd738 7232cdf7e8
commit 7e5691804d
139 changed files with 1196 additions and 758 deletions
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -20,9 +20,7 @@ class Api::V1::FavouritesController < Api::BaseController

  def cached_favourites
    cache_collection(
-      Status.where(
-        id: results.map(&:status_id)
-      ),
+      Status.reorder(nil).joins(:favourites).merge(results),
      Status
    )
  end