This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/controllers/api
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
v2 Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661) 2018-05-29 02:01:24 +02:00
web Sanitize and sandbox toot embeds (#9552) 2018-12-23 02:16:35 +01:00
base_controller.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
oembed_controller.rb
push_controller.rb
salmon_controller.rb Fix response of signature_verification_failure_reason (#6441) 2018-02-08 05:00:45 +01:00
subscriptions_controller.rb