Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		2022-05-01 16:52:27 +02:00
..
accounts_cli.rb	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	2022-04-06 20:58:12 +02:00
cache_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	2019-09-10 13:48:48 +02:00
canonical_email_blocks_cli.rb	Add ability for admins to delete canonical email blocks (#16644)	2021-12-17 23:02:14 +01: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 wrong language code for Kurdish languages (#17812)	2022-03-17 01:37:03 +01:00
media_cli.rb	Skip blocked domains media on tootctl media refresh (#16914)	2021-10-28 19:30:44 +02:00
migration_helpers.rb	Fix migration error handling (#17991)	2022-04-07 20:46:30 +02:00
premailer_webpack_strategy.rb	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	2018-01-29 01:06:39 +01:00
preview_cards_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	2019-09-10 13:48:48 +02:00
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 opening and closing Redis connections instead of using a pool (#18171)	2022-04-29 22:43:07 +02:00
settings_cli.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01: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-04-08 23:00:03 +02:00