luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-04 05:54:27 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api
History
David Yip 8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream 
Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
5bf5003384.
It was resolved by accepting tootsuite's changes.
2018-06-07 05:13:49 -05:00
..
v1 Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +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 Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
subscriptions_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00