Claire 73f77c49d8 Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.

2026-03-16 18:16:56 +01:00

..

accounts

Add targeted_account_notes association to simplify usage (#35540)

2026-01-23 16:35:19 +00:00

admin

Update rubocop to version 1.79.0 (#35502)

2025-07-25 07:22:05 +00:00

announcements

…

apps

Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192)

2024-05-17 13:46:12 +00:00

domain_blocks

Add preview of followers removed in domain block modal in web UI (#32032)

2024-09-25 18:13:36 +00:00

emails

…

featured_tags

Extract constants for controller LIMIT queries (#32921)

2024-11-18 09:23:38 +00:00

instances

Fix missing terms of services link (#35115)

2025-06-21 08:59:47 +00:00

lists

Change lists to reflect added and removed users retroactively (#32930)

2024-11-19 10:04:12 +00:00

notifications

Fix notification requests from suspended accounts still being listed (#32354)

2024-10-09 17:29:02 +00:00

peers

Use consistent calling style for TagManager#normalize_domain (#35764)

2026-02-27 16:38:34 +00:00

polls

Merge commit from fork

2025-12-08 15:44:08 +01:00

profile

Add delay to profile updates to debounce them (#34137)

2025-03-11 16:17:17 +00:00

push

Extract params hash for api/v1/push/subscriptions#create (#35475)

2025-07-24 07:49:20 +00:00

statuses

Use to_json call for pins API (#38231)

2026-03-16 15:06:22 +00:00

timelines

Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream

2025-10-06 19:24:16 +02:00

trends

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

2025-03-25 19:59:59 +01:00

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

Add wrapstodon to initial state and show wrapstodon sidebar item on load (#37261)

2025-12-16 09:47:18 +00:00

apps_controller.rb

Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192)

2024-05-17 13:46:12 +00:00

blocks_controller.rb

Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795)

2026-02-17 14:56:46 +00:00

bookmarks_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

conversations_controller.rb

Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795)

2026-02-17 14:56:46 +00:00

custom_emojis_controller.rb

…

directories_controller.rb

Eager loading fixes for api/ controllers (#28848)

2024-01-23 11:41:54 +00:00

domain_blocks_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

donation_campaigns_controller.rb

Convert Oj.load -> JSON.parse in most places (#38236)

2026-03-16 16:38:19 +00:00

endorsements_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

favourites_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

featured_tags_controller.rb

Add REST API for featuring and unfeaturing a hashtag (#34489)

2025-04-25 15:12:05 +00:00

filters_controller.rb

Update rubocop to version 1.77.0 (#35128)

2025-06-23 07:40:11 +00:00

follow_requests_controller.rb

Drop support for ruby 3.1 (#32363)

2024-10-31 15:12:08 +00:00

followed_tags_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

instances_controller.rb

Add Deprecation headers on deprecated endpoints (#34262)

2025-03-25 12:30:10 +00:00

invites_controller.rb

Add coverage for api/v1/invites scenarios (#35389)

2025-07-21 14:17:53 +00:00

lists_controller.rb

Use enum validation instead of ArgumentError rescue for List replies policy check (#34452)

2025-04-14 21:11:10 +00:00

markers_controller.rb

Add timestamp spec for markers API response (#38206)

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

media_controller.rb

Add API to delete media attachments that are not in use (#33991)

2025-02-28 13:41:42 +00:00

mutes_controller.rb

Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795)

2026-02-17 14:56:46 +00:00

notifications_controller.rb

Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream

2024-07-30 20:47:34 +02:00

polls_controller.rb

Merge commit from fork

2025-12-08 15:44:08 +01:00

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

Allow reporting (local) Collections (#37848)

2026-02-13 11:11:44 +00:00

scheduled_statuses_controller.rb

Merge pull request from GHSA-58x8-3qxw-6hm7

2024-07-04 16:26:49 +02:00

statuses_controller.rb

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

2026-03-03 18:12:16 +01:00

streaming_controller.rb

Fix potential redirection loop of streaming endpoint (#28665)

2024-01-10 15:05:46 +00:00

suggestions_controller.rb

Fix incorrect deprecation warning for DELETE /api/v1/suggestions/:id (#34397)

2025-04-08 14:32:17 +00:00

tags_controller.rb

Use normalizes for tag name attribute (#37119)

2026-02-27 15:56:08 +00:00