diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-25 21:36:22 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-25 21:36:22 +0200 |
| commit | 7e5691804d4f0019a89b8b8a3dad532bc9d940ea (patch) | |
| tree | 84c2f4e4ac07bea3915639a50df84eb62b6c5768 /app/controllers/api/v1 | |
| parent | 852acbd7385a640d9e00e462d58a847851744034 (diff) | |
| parent | 7232cdf7e8249f79078005931b1165e54e413fa9 (diff) | |
Merge git://github.com/tootsuite/mastodon into tootsuite-master
Diffstat (limited to 'app/controllers/api/v1')
| -rw-r--r-- | app/controllers/api/v1/favourites_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb index 92c0a62a9..9d73bb337 100644 --- 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 |