tootlab-mastodon

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

History

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

Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.

2025-01-10 20:41:36 +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

Update docker/dockerfile Docker tag to v1.12 (#33127 )