diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-11-06 15:22:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-06 15:22:44 +0100 |
| commit | 36dab188fd83876ba5e0e08a4b6647a445e2f24f (patch) | |
| tree | 28bdd407eac81bfcc2741ad2c1714192d774754a /app/controllers/api | |
| parent | 34209c0340ca6b7c61de964a17f5f3fe2e0f7c7b (diff) | |
| parent | 7775225d174bf7c413bcd41b89a5d50d32cc5cee (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/v1/timelines/tag_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb index cf58d5cf4..92c32c178 100644 --- a/app/controllers/api/v1/timelines/tag_controller.rb +++ b/app/controllers/api/v1/timelines/tag_controller.rb @@ -45,7 +45,7 @@ class Api::V1::Timelines::TagController < Api::BaseController end def tag_timeline_statuses - Status.as_tag_timeline(@tag, current_account, truthy_param?(:local)) + HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none), current_account, truthy_param?(:local)) end def insert_pagination_headers |