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.

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
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
locales	New Crowdin updates (#20580)	2 years ago
locales-glitch	Add back missing glitch-soc admin settings (#1919)	2 years ago
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application.rb	Fix `mailers` queue not being used for mailers (#20274)	2 years ago
boot.rb	…
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2 years ago
database.yml	Format JSON and YAML using Prettier (#17823)	2 years ago
deploy.rb	Change `master` branch to `main` branch (#20290)	2 years ago
environment.rb	…
i18n-tasks.yml	Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)""	2 years ago
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
pghero.yml	…
puma.rb	…
roles.yml	Add customizable user roles (#18641)	2 years ago
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
secrets.yml	…
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
sidekiq.yml	Change incoming activity processing to happen in `ingress` queue (#20264)	2 years ago
storage.yml	…
webpacker.yml	…