You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/controllers/api
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
7 years ago
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
v2 Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661) 7 years ago
web
base_controller.rb Support min_id-based pagination in REST API (#8736) 7 years ago
oembed_controller.rb
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb