Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code. |
||
|---|---|---|
| .. | ||
| .dockerignore | ||
| .eslintrc.cjs | ||
| Dockerfile | ||
| database.js | ||
| errors.js | ||
| index.js | ||
| logging.js | ||
| metrics.js | ||
| package.json | ||
| redis.js | ||
| tsconfig.json | ||
| utils.js | ||