Claire 5d7e3bbd17 Merge commit from fork ...

* Fix GHSA-7jvv-fhmg-wpfw

* Fix GHSA-hx34-2pfw-2qfj

* Fix GHSA-vwhj-3g83-v276

* Bump version to v4.6.4

2026-08-14 07:27:50 -04:00

..

accounts

Accept avatar_description and header_description in /api/v1/accounts/update_credentials (#39547)

2026-06-23 17:35:29 +02:00

admin

Merge commit from fork

2026-08-14 07:27:50 -04:00

announcements

…

apps

…

domain_blocks

…

emails

…

featured_tags

…

instances

Use resources to declare API TOS access endpoints (#38416)

2026-03-26 14:07:06 +00:00

lists

…

notifications

Add policy to filter notifications from bots (#38494) (#38809)

2026-06-09 12:28:53 +00:00

peers

…

polls

…

profile

…

push

…

statuses

Change /api/v1/statuses/:id/history to always return at least one item (#25510)

2026-07-11 13:42:14 -04:00

timelines

…

trends

…

accounts_controller.rb

Use to_json call for accounts API (#38226)

2026-03-16 14:40:03 +00:00

announcements_controller.rb

…

annual_reports_controller.rb

…

apps_controller.rb

…

blocks_controller.rb

…

bookmarks_controller.rb

…

collection_items_controller.rb

Add Deprecation headers to collections alpha API (#39349)

2026-06-09 15:40:01 +00:00

collections_controller.rb

Add Deprecation headers to collections alpha API (#39349)

2026-06-09 15:40:01 +00:00

conversations_controller.rb

…

custom_emojis_controller.rb

…

directories_controller.rb

…

domain_blocks_controller.rb

…

donation_campaigns_controller.rb

Rescue JSON::ParserError where already converted (#38244)

2026-03-17 08:57:10 +00:00

endorsements_controller.rb

…

favourites_controller.rb

…

featured_tags_controller.rb

…

filters_controller.rb

…

follow_requests_controller.rb

…

followed_tags_controller.rb

…

in_collections_controller.rb

Remove collections feature flag (#39211)

2026-05-29 09:37:42 +00:00

instances_controller.rb

…

invites_controller.rb

…

lists_controller.rb

…

markers_controller.rb

Add timestamp spec for markers API response (#38206)

2026-03-16 08:48:10 +00:00

media_controller.rb

…

mutes_controller.rb

…

notifications_controller.rb

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

2026-04-30 19:00:48 +02:00

polls_controller.rb

…

preferences_controller.rb

…

profiles_controller.rb

Add avatar_description and header_description parameters to PATCH /api/v1/profile (#38221)

2026-03-16 14:04:25 +00:00

reports_controller.rb

Remove collections feature flag (#39211)

2026-05-29 09:37:42 +00:00

scheduled_statuses_controller.rb

…

statuses_controller.rb

Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream

2026-05-30 12:13:35 +02:00

streaming_controller.rb

…

suggestions_controller.rb

…

tags_controller.rb

…