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 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
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) 7 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 Update Rails (#8141) 8 years ago
subscriptions_controller_spec.rb Update Rails (#8141) 8 years ago