Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

cafdf184

Commit cafdf184 authored 4 years ago by lain

Downloads
- Plain Diff

Merge branch '1873-pagination-fixes' into 'develop'

[#1873] :offset pagination param support, hashtags pagination

Closes #1873

See merge request pleroma/pleroma!2659

parents 372533b7 5237a2df

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/pagination.ex 6 additions, 0 deletions

lib/pleroma/pagination.ex
lib/pleroma/web/api_spec/helpers.ex 6 additions, 0 deletions

lib/pleroma/web/api_spec/helpers.ex
lib/pleroma/web/mastodon_api/controllers/search_controller.ex 19 additions, 12 deletions

...pleroma/web/mastodon_api/controllers/search_controller.ex
test/web/mastodon_api/controllers/search_controller_test.exs 16 additions, 0 deletions

test/web/mastodon_api/controllers/search_controller_test.exs
test/web/mastodon_api/controllers/status_controller_test.exs 1 addition, 1 deletion

test/web/mastodon_api/controllers/status_controller_test.exs

with 48 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment