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 f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
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 Add error message with invalid email confirmation (#9625) 7 years ago
oembed_controller.rb
push_controller.rb
salmon_controller.rb Fix response of signature_verification_failure_reason (#6441) 8 years ago
subscriptions_controller.rb