Mastodon

History

Claire 0c80bf0e82 Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream

Conflicts:
- `vite.config.mts`:
  Upstream changed a line adjacent to one glitch-soc modified due to its theming system.
  Adapted upstream's change.
- `yarn.lock`:
  Upstream updated a dependency next to one glitch-soc added.
  Updated the dependency as upstream did.

2026-05-19 20:40:57 +02:00

annotate_rb.rake

Change dependency from annotate to annotaterb (#30232 )

2024-11-18 14:40:02 +00:00

assets.rake

Fix generation of static error pages in glitch-soc

2026-02-11 14:12:46 +01:00

branding.rake

Fix Rails/RootPathnameMethods cop (#31582 )

2024-08-26 07:35:07 +00:00

db.rake

Drop support for PostgreSQL 13 (#36540 )