tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-09 00:12:13 -05:00

History

Claire a417d6f3fc Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream

Conflicts:
- `app/services/precompute_feed_service.rb`:
  Upstream added an option to skip half-generated timelines.
  We have a conflict because we still maintain upstream's old chronological DM
  timelines.
  Update our code to apply the same logic to the DM timelines.

2025-02-07 21:21:28 +01:00

__mocks__

Change icon SVG imports to use a default import (#28709 )

2024-01-12 10:31:24 +00:00

entrypoints

Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream

2025-01-10 20:41:36 +01:00

flavours

[Glitch] Fix emoji rewrite adding unnecessary curft to the DOM for most emoji

2025-02-04 18:41:09 +01:00

fonts

Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream