mastodon/spec/controllers/api/v1
Thibaut Girka c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
..
accounts Change bio limit from 160 to 500 (#10790) 2019-05-19 22:51:44 +02:00
apps Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
instances Add specs for Api::V1::Instances::PeersController (#9546) 2018-12-17 11:35:55 +01:00
lists Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
polls Add polls (#10111) 2019-03-03 22:18:23 +01: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/merge-upstream 2018-10-05 15:23:57 +02:00
timelines Add scheduled statuses (#9706) 2019-01-05 12:43:28 +01:00
accounts_controller_spec.rb Add REST API for creating an account (#9572) 2018-12-24 19:12:38 +01: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
conversations_controller_spec.rb Add scheduled statuses (#9706) 2019-01-05 12:43:28 +01: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
endorsements_controller_spec.rb Add spec for Api::V1::EndorsementsController (#9543) 2018-12-17 11:32:44 +01:00
favourites_controller_spec.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
filters_controller_spec.rb Add polls (#10111) 2019-03-03 22:18:23 +01: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 Not to skip executable specs (#9753) 2019-01-10 15:12:31 +01: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 `account_id` param to `GET /api/v1/notifications` (#10796) 2019-05-21 13:28:49 +02:00
polls_controller_spec.rb Add polls (#10111) 2019-03-03 22:18:23 +01: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 Lint pass (#8876) 2018-10-04 12:36:53 +02:00
suggestions_controller_spec.rb Re-add follow recommendations API (#7918) 2018-07-03 01:47:56 +02:00