aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon/spec/controllers/api/v1
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
..
accounts Merge branch 'master' into glitch-soc/tentative-merge
apps Use raw status code on have_http_status ()
lists Add more granular OAuth scopes ()
push Add REST API for Web Push Notifications subscriptions ()
statuses Introduce OAuth scopes for bookmarks
timelines Add more granular OAuth scopes ()
accounts_controller_spec.rb Add more granular OAuth scopes ()
apps_controller_spec.rb Use raw status code on have_http_status ()
blocks_controller_spec.rb Add more granular OAuth scopes ()
bookmarks_controller_spec.rb Introduce OAuth scopes for bookmarks
custom_emojis_controller_spec.rb Use raw status code on have_http_status ()
domain_blocks_controller_spec.rb Add more granular OAuth scopes ()
favourites_controller_spec.rb Add more granular OAuth scopes ()
filter_controller_spec.rb Add more granular OAuth scopes ()
follow_requests_controller_spec.rb Add more granular OAuth scopes ()
follows_controller_spec.rb Add more granular OAuth scopes ()
instances_controller_spec.rb Use raw status code on have_http_status ()
lists_controller_spec.rb Add more granular OAuth scopes ()
media_controller_spec.rb Add more granular OAuth scopes ()
mutes_controller_spec.rb Merge branch 'master' into glitch-soc/merge-upstream
notifications_controller_spec.rb Add more granular OAuth scopes ()
reports_controller_spec.rb Add more granular OAuth scopes ()
search_controller_spec.rb Add more granular OAuth scopes ()
statuses_controller_spec.rb Add more granular OAuth scopes ()
streaming_controller_spec.rb Redirect to streaming_api_base_url ()
suggestions_controller_spec.rb Re-add follow recommendations API ()