tootlab-mastodon/spec/controllers/api/v1
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
2018-10-01 12:43:20 +02:00
..
accounts Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
apps Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
lists Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
push Add REST API for Web Push Notifications subscriptions (#7445) 2018-05-11 11:49:12 +02:00
statuses Introduce OAuth scopes for bookmarks 2018-08-10 16:49:06 +02:00
timelines Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
accounts_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +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 Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
bookmarks_controller_spec.rb Introduce OAuth scopes for bookmarks 2018-08-10 16:49:06 +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 Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
favourites_controller_spec.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
filter_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
follow_requests_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
follows_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +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 Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
media_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
mutes_controller_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-27 18:09:28 +02:00
notifications_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
reports_controller_spec.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
search_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
statuses_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
streaming_controller_spec.rb Redirect to streaming_api_base_url (#3579) 2017-06-05 12:09:29 +02:00
suggestions_controller_spec.rb Re-add follow recommendations API (#7918) 2018-07-03 01:47:56 +02:00