mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-14 15:15:08 +01:00
Code Issues Projects Releases Wiki Activity
ba4521b175
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
2018-08-27 18:09:28 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-27 18:09:28 +02:00
v2 Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
web Add tests for embeds controller (#7719) 2018-06-04 10:35:56 +09:00
base_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
oembed_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
push_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
salmon_controller_spec.rb Update Rails (#8141) 2018-08-13 18:17:20 +02:00
subscriptions_controller_spec.rb Update Rails (#8141) 2018-08-13 18:17:20 +02:00