You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app
Claire 1901829f9a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Our config file is pretty different from upstream.
  Upstream changed CSP directive `script-src` to include
  `wasm-unsafe-eval` instead of `unsafe-eval`, which we
  did not include.
  Added `wasm-unsafe-eval` to `script-src` to fix
  execution of the OCR web worker.
- `package.json`:
  Upstream updated a dependency (`array-includes`) textually
  adjacent to a glitch-soc-only dependency (`atrament`).
  Updated `array-includes` as upstream did.
2 years ago
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
helpers Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
javascript Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
lib Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
mailers
models Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
policies Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
presenters Change sign-in banner to reflect disabled or moved account status (#19773) 2 years ago
serializers Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
services Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
validators Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
views Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
workers Merge branch 'main' into glitch-soc/merge-upstream 2 years ago