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 45fce0e496 Merge branch 'master' into glitch-soc/merge
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
8 years ago
..
v1 Merge branch 'master' into glitch-soc/merge 8 years ago
web Add REST API for Web Push Notifications subscriptions (#7445) 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 Use raw status code on have_http_status (#7214) 8 years ago
subscriptions_controller_spec.rb Use raw status code on have_http_status (#7214) 8 years ago