Glitch-Shrike/spec/controllers/api/v1
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
..
accounts Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
apps
lists
push
statuses Introduce OAuth scopes for bookmarks 2018-08-10 16:49:06 +02:00
timelines
accounts_controller_spec.rb
apps_controller_spec.rb
blocks_controller_spec.rb
bookmarks_controller_spec.rb Introduce OAuth scopes for bookmarks 2018-08-10 16:49:06 +02:00
custom_emojis_controller_spec.rb
domain_blocks_controller_spec.rb
favourites_controller_spec.rb
filter_controller_spec.rb
follow_requests_controller_spec.rb
follows_controller_spec.rb
instances_controller_spec.rb
lists_controller_spec.rb
media_controller_spec.rb
mutes_controller_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-27 18:09:28 +02:00
notifications_controller_spec.rb
reports_controller_spec.rb
search_controller_spec.rb
statuses_controller_spec.rb
streaming_controller_spec.rb
suggestions_controller_spec.rb