Claire 0e1ea3110e Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
  line adding a glitch API version.

2026-02-27 21:25:37 +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

…

domain_blocks

…

emails

…

featured_tags

…

instances

…

lists

…

notifications

…

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

…

push

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

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

statuses

Refactor activity serialization (#37678)

2026-02-05 09:39:27 +00:00

timelines

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

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

trends

…

accounts_controller.rb

…

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

…

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

…

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

…

domain_blocks_controller.rb

…

donation_campaigns_controller.rb

Add GET /api/v1/donation_campaigns (#37880)

2026-02-17 10:54:21 +00:00

endorsements_controller.rb

…

favourites_controller.rb

…

featured_tags_controller.rb

…

filters_controller.rb

Update rubocop to version 1.77.0 (#35128)

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

follow_requests_controller.rb

…

followed_tags_controller.rb

…

instances_controller.rb

…

invites_controller.rb

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

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

lists_controller.rb

…

markers_controller.rb

…

media_controller.rb

…

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

…

polls_controller.rb

Merge commit from fork

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

preferences_controller.rb

…

profiles_controller.rb

Add PATCH /api/v1/profile (#37934)

2026-02-24 10:48:56 +00:00

reports_controller.rb

Allow reporting (local) Collections (#37848)

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

scheduled_statuses_controller.rb

…

statuses_controller.rb

Merge pull request #3364 from ClearlyClaire/glitch-soc/features/local-only-drop-emoji

2026-01-27 22:30:17 +01:00

streaming_controller.rb

…

suggestions_controller.rb

…

tags_controller.rb

Use normalizes for tag name attribute (#37119)

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