mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 16:28:59 +00:00

Files

Claire 93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream

Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.

2025-06-24 22:43:43 +02:00

contrast

fix: Fix unreadable text in high-contrast-mode (#35032 )

2025-06-13 12:58:30 +00:00

entrypoints

chore(deps): update dependency stylelint-config-standard-scss to v15 (#34658 )

2025-05-19 12:46:11 +00:00

fonts

Use @/ absolute paths instead of relative paths in CSS (#34806 )

2025-05-26 07:27:44 +00:00

mastodon

Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream