namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/spec/controllers/api/v1
History
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge 
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
2018-07-09 07:13:59 +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 Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +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 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 Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
favourites_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +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/tentative-merge 2018-07-09 07:13:59 +02:00
notifications_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
reports_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +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