mastodon/spec/controllers/api/v1
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
2018-05-11 18:12:42 +02:00
..
accounts Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
apps Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
lists Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
push Add REST API for Web Push Notifications subscriptions (#7445) 2018-05-11 11:49:12 +02:00
statuses Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
timelines Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
accounts_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
apps_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
blocks_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
bookmarks_controller_spec.rb Add spec for bookmark endpoints 2018-04-11 21:05:34 +02:00
custom_emojis_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
domain_blocks_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
favourites_controller_spec.rb
follow_requests_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
follows_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
instances_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
lists_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
media_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
mutes_controller_spec.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
notifications_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
reports_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
search_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
statuses_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
streaming_controller_spec.rb