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 c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
7 years ago
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
v2 Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 7 years ago
web Sanitize and sandbox toot embeds (#9552) 7 years ago
base_controller.rb Explicitly disable storage of REST API results (#10655) 7 years ago
oembed_controller.rb
proofs_controller.rb Add Keybase integration (#10297) 7 years ago
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb