tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/api/v1
History
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
 		2022-06-28 11:11:18 +02:00
..
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
admin Add /api/v1/admin/domain_allows (#18668) 2022-06-23 23:12:01 +02:00
announcements Add announcements (#12662) 2020-01-23 22:00:13 +01:00
apps Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
emails Fix `POST /api/v1/emails/confirmations` not being available after sign-up (#17743) 2022-03-12 04:14:25 +01:00
filters Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
instances Add specs for Api::V1::Instances::PeersController (#9546) 2018-12-17 11:35:55 +01:00
lists Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
polls Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
push Add `policy` param to `POST /api/v1/push/subscriptions` (#16040) 2021-04-15 05:00:25 +02:00
statuses Spelling (#17705) 2022-03-06 22:51:40 +01:00
timelines Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
trends Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
accounts_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
announcements_controller_spec.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
apps_controller_spec.rb Fix app name, website and redirect URIs not having a maximum length (#16042) 2021-04-15 16:28:43 +02:00
blocks_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
bookmarks_controller_spec.rb Support min_id-based pagination for bookmarks (#12381) 2019-11-17 17:09:41 +01:00
conversations_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +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 Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01: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 Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
follow_requests_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
instances_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
lists_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
markers_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
media_controller_spec.rb Add editing for published statuses (#17320) 2022-02-10 00:15:30 +01:00
mutes_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
notifications_controller_spec.rb Add `types` param to `GET /api/v1/notifications` in REST API (#17767) 2022-03-15 04:11:29 +01:00
polls_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
reports_controller_spec.rb Fix report category not being saved in REST API (#17682) 2022-03-02 18:57:08 +01:00
statuses_controller_spec.rb Revamp post filtering system (#18058) 2022-06-28 09:42:13 +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