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.		2022-11-16 08:30:00 +01:00
..
accounts_cli.rb	Add `--remove-role` option to `tootctl accounts modify` (#19477)	2022-10-27 14:31:10 +02:00
cache_cli.rb	…
canonical_email_blocks_cli.rb	Add admin API for managing canonical e-mail blocks (#19067)	2022-08-28 03:31:54 +02:00
cli_helper.rb	Fix opening and closing Redis connections instead of using a pool (#18171)	2022-04-29 22:43:07 +02:00
domains_cli.rb	Add --by-uri option to `tootctl domains purge` (#16434)	2021-07-07 21:17:00 +02:00
email_domain_blocks_cli.rb	Fix tootctl email_domain_blocks add (#17842)	2022-03-21 19:10:09 +01:00
emoji_cli.rb	Enable importing GIF emojis in CLI (#17706)	2022-03-06 23:41:44 +01:00
feeds_cli.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
ip_blocks_cli.rb	Fix tootctl ip_blocks add failing if not given a comment (#15263)	2020-12-02 21:19:41 +01:00
maintenance_cli.rb	Fix index name in fix-duplicates task (#20632)	2022-11-14 08:33:48 +01:00
media_cli.rb	Fix Ambiguous SQL error on tootctl media refresh (#19206)	2022-09-20 23:50:19 +02:00
migration_helpers.rb	Fix migration error handling (#17991)	2022-04-07 20:46:30 +02:00
premailer_webpack_strategy.rb	…
preview_cards_cli.rb	…
rack_middleware.rb	Fix opening and closing Redis connections instead of using a pool (#18171)	2022-04-29 22:43:07 +02:00
redis_config.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
search_cli.rb	Fix typos (#18604)	2022-08-28 17:44:34 +02:00
settings_cli.rb	Add ability to set approval-based registration through tootctl (#18248)	2022-05-02 17:41:34 +02:00
sidekiq_middleware.rb	Fix opening and closing Redis connections instead of using a pool (#18171)	2022-04-29 22:43:07 +02:00
snowflake.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
statuses_cli.rb	Spelling (#17705)	2022-03-06 22:51:40 +01:00
upgrade_cli.rb	Fix `tootctl upgrade storage-schema` S3 ACL (#13768)	2020-05-17 17:27:36 +02:00
version.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-16 08:30:00 +01:00