Claire f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.

2023-09-21 15:12:00 +02:00

..

accounts

Add hide_collections, discoverable and indexable attributes to credentials API (#26998)

2023-09-20 18:25:16 +02:00

admin

Added admin api for managing tags (#26872)

2023-09-13 11:22:53 +02:00

apps

Migrate to request specs in /api/v1/apps/verify_credentials (#25404)

2023-06-14 09:48:57 +02:00

emails

Migrate to request specs in /api/v1/emails/confirmations (#25686)

2023-07-17 16:22:33 +02:00

instances

Add GET /api/v1/instance/languages to REST API (#24443)

2023-08-03 11:25:47 +02:00

statuses

Wrong count in response when removing favourite/reblog (#24365)

2023-07-19 09:02:30 +02:00

timelines

Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream

2023-08-24 21:50:14 +02:00

accounts_show_spec.rb

migrate test for GET /api/v1/accounts/{account_id} to request spec (#25322)

2023-06-10 18:33:24 +02:00

apps_spec.rb

Migrate to request specs in /api/v1/apps (#25401)

2023-06-14 09:48:48 +02:00

bookmarks_spec.rb

Migrate to request specs in /api/v1/bookmarks (#25520)

2023-07-18 09:15:50 +02:00

domain_blocks_spec.rb

Migrate to request specs in /api/v1/domain_blocks (#25414)

2023-06-14 16:08:53 +02:00

featured_tags_spec.rb

Extract shared examples from api specs (#25387)

2023-06-14 09:34:01 +02:00

follow_requests_spec.rb

Migrate to request specs in /api/v1/follow_requests (#25411)

2023-06-14 15:43:50 +02:00

lists_spec.rb

Migrate to request specs in /api/v1/lists (#25443)

2023-06-15 10:19:51 +02:00

mutes_spec.rb

Migrate to request specs in /api/v1/mutes (#25622)

2023-07-18 13:05:19 +02:00

polls_spec.rb

Migrate to request specs in /api/v1/polls (#25596)

2023-07-17 16:50:00 +02:00

profiles_spec.rb

Refactor Api::V1::ProfilesController into two separate controllers (#26573)

2023-08-21 15:47:09 +02:00

suggestions_spec.rb

Migrate to request specs in /api/v1/suggestions (#25540)

2023-06-22 11:49:35 +02:00

tags_spec.rb

Migrate to request specs in /api/v1/tags (#25439)

2023-06-19 08:51:40 +02:00