diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-07 15:03:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-07 15:03:31 +0200 |
| commit | 3f9959a4b66c8d33a1de6dd13972327ff62f2cd3 (patch) | |
| tree | 56bef462d8ec527b893e5f02d687d419b5440cc9 /app/controllers/api/v1/trends | |
| parent | 00c9363f07081e0149533023992fba47dd905384 (diff) | |
| parent | e2f4bafc136cb0853321ed4be1b02106bec8bc93 (diff) | |
Merge pull request #1734 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/trends')
| -rw-r--r-- | app/controllers/api/v1/trends/tags_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/trends/tags_controller.rb b/app/controllers/api/v1/trends/tags_controller.rb index d77857871..329ef5ae7 100644 --- a/app/controllers/api/v1/trends/tags_controller.rb +++ b/app/controllers/api/v1/trends/tags_controller.rb @@ -16,7 +16,7 @@ class Api::V1::Trends::TagsController < Api::BaseController def set_tags @tags = begin if Setting.trends - Trends.tags.query.allowed.limit(limit_param(DEFAULT_TAGS_LIMIT)) + Trends.tags.query.allowed.offset(offset_param).limit(limit_param(DEFAULT_TAGS_LIMIT)) else [] end |