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 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`.
6 years ago
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
v2 Add more granular OAuth scopes (#7929) 7 years ago
web Lint pass (#8876) 7 years ago
base_controller_spec.rb Use raw status code on have_http_status (#7214) 7 years ago
oembed_controller_spec.rb Use raw status code on have_http_status (#7214) 7 years ago
proofs_controller_spec.rb Add Keybase integration (#10297) 6 years ago
push_controller_spec.rb Use raw status code on have_http_status (#7214) 7 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