mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-23 08:34:13 -05:00
5a55180b95
Conflicts: - `spec/lib/sanitize/config_spec.rb`: Upstream rewrote top-level `describe` calls to `RSpec.describe`, and glitch-soc had differences in the first few tests because of the wider subset of HTML it accepts. Changed `describe` to `RSpec.describe` as upstream did, keeping glitch-soc's tests. |
||
---|---|---|
.. | ||
.dockerignore | ||
.eslintrc.cjs | ||
database.js | ||
Dockerfile | ||
errors.js | ||
index.js | ||
logging.js | ||
metrics.js | ||
package.json | ||
redis.js | ||
tsconfig.json | ||
utils.js |