Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/account.rb`: Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits. Ported upstream's changes. - `yarn.lock`: Dependencies adjacent to glitch-soc-only dependencies updated. Updated them as well.		2024-10-26 13:38:07 +02: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: Refactor move database and redis logic into separate files (#31567)	2024-08-27 08:40:04 +00:00
Dockerfile	Update docker/dockerfile Docker tag to v1.10 (#32166)	2024-10-01 09:29:38 +00:00
errors.js	Convert the streaming server to ESM (#29389)	2024-02-27 14:59:20 +00:00
index.js	Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream	2024-10-19 19:13:32 +02:00
logging.js	Convert the streaming server to ESM (#29389)	2024-02-27 14:59:20 +00:00
metrics.js	Fix missing or incorrect cache-control headers for Streaming server (#32551)	2024-10-17 08:17:18 +00:00
package.json	Update Yarn to v4.5.1 (#32586)	2024-10-21 07:28:01 +00:00
redis.js	Fix: Use consistent REDIS_USER environment variable in streaming (#32493)	2024-10-15 07:40:18 +00:00
tsconfig.json	Update devDependencies (non-major) (#29089)	2024-02-27 16:07:43 +00:00
utils.js	Streaming: Refactor move database and redis logic into separate files (#31567)	2024-08-27 08:40:04 +00:00