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 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.
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