Claire 1fdb48c668 Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Updated upstream changes.

2025-12-15 20:22:20 +01:00

..

base_controller.rb

…

collections_controller.rb

…

contexts_controller.rb

Rework FEP-7888 implementation (#36064)

2025-09-09 18:27:30 +00:00

followers_synchronizations_controller.rb

…

inboxes_controller.rb

Upgrade rubocop-rails from 2.33.4 to 2.34.2 and address related offenses (#37243)

2025-12-15 12:57:16 +00:00

likes_controller.rb

Merge commit from fork

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

outboxes_controller.rb

Add support for numeric-based URIs for local accounts (#32724)

2025-09-29 12:05:48 +00:00

quote_authorizations_controller.rb

Merge commit from fork

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

replies_controller.rb

Merge commit from fork

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

shares_controller.rb

Merge commit from fork

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