mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00

Files

Claire c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream

Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.

2025-02-01 19:07:13 +01:00

.dockerignore

Dockerfile rewrite based on Ruby image with performance optimizations and size reduction, dedicated Streaming image (#26850 )

2023-11-28 10:04:40 +00:00

.eslintrc.cjs

Convert the streaming server to ESM (#29389 )

2024-02-27 14:59:20 +00:00

database.js

Streaming: add development logging of database queries (#32945 )

2024-11-18 09:34:34 +00:00

Dockerfile

build(Dockerfiles): Set the base registry via an ARG (#33712 )