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/spec/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 more granular OAuth scopes (#7929) 8 years ago
web Lint pass (#8876) 8 years ago
base_controller_spec.rb Use raw status code on have_http_status (#7214) 8 years ago
oembed_controller_spec.rb Use raw status code on have_http_status (#7214) 8 years ago
push_controller_spec.rb Use raw status code on have_http_status (#7214) 8 years ago
salmon_controller_spec.rb rubocop issues - Cleaning up (#8912) 7 years ago
subscriptions_controller_spec.rb rubocop issues - Cleaning up (#8912) 7 years ago