1
0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
mastodon/spec/controllers/api/v1
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.
2019-01-10 21:00:30 +01:00
..
accounts Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
apps Use raw status code on have_http_status () 2018-04-21 21:35:07 +02:00
instances Add specs for Api::V1::Instances::PeersController () 2018-12-17 11:35:55 +01:00
lists Add more granular OAuth scopes () 2018-07-05 18:31:35 +02:00
push Add REST API for Web Push Notifications subscriptions () 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 () 2019-01-05 12:43:28 +01:00
accounts_controller_spec.rb Add REST API for creating an account () 2018-12-24 19:12:38 +01:00
apps_controller_spec.rb Use raw status code on have_http_status () 2018-04-21 21:35:07 +02:00
blocks_controller_spec.rb Add more granular OAuth scopes () 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 () 2019-01-05 12:43:28 +01:00
custom_emojis_controller_spec.rb Use raw status code on have_http_status () 2018-04-21 21:35:07 +02:00
domain_blocks_controller_spec.rb Add more granular OAuth scopes () 2018-07-05 18:31:35 +02:00
endorsements_controller_spec.rb Add spec for Api::V1::EndorsementsController () 2018-12-17 11:32:44 +01:00
favourites_controller_spec.rb Support min_id-based pagination in REST API () 2018-09-28 02:23:45 +02:00
filter_controller_spec.rb Add more granular OAuth scopes () 2018-07-05 18:31:35 +02:00
follow_requests_controller_spec.rb Add more granular OAuth scopes () 2018-07-05 18:31:35 +02:00
follows_controller_spec.rb Add more granular OAuth scopes () 2018-07-05 18:31:35 +02:00
instances_controller_spec.rb Use raw status code on have_http_status () 2018-04-21 21:35:07 +02:00
lists_controller_spec.rb Add more granular OAuth scopes () 2018-07-05 18:31:35 +02:00
media_controller_spec.rb Not to skip executable specs () 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 scheduled statuses () 2019-01-05 12:43:28 +01:00
reports_controller_spec.rb Support min_id-based pagination in REST API () 2018-09-28 02:23:45 +02:00
search_controller_spec.rb Add more granular OAuth scopes () 2018-07-05 18:31:35 +02:00
statuses_controller_spec.rb Add more granular OAuth scopes () 2018-07-05 18:31:35 +02:00
streaming_controller_spec.rb Lint pass () 2018-10-04 12:36:53 +02:00
suggestions_controller_spec.rb Re-add follow recommendations API () 2018-07-03 01:47:56 +02:00