aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
..
v1 Merge branch 'master' into glitch-soc/merge-upstream
v2 Add more granular OAuth scopes ()
web Add tests for embeds controller ()
base_controller_spec.rb Use raw status code on have_http_status ()
oembed_controller_spec.rb Use raw status code on have_http_status ()
push_controller_spec.rb Use raw status code on have_http_status ()
salmon_controller_spec.rb Update Rails ()
subscriptions_controller_spec.rb Update Rails ()