You can not 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 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2 years ago
..
accounts_cli.rb	Add `--remove-role` option to `tootctl accounts modify` (#19477)	2 years ago
cache_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
canonical_email_blocks_cli.rb	Add admin API for managing canonical e-mail blocks (#19067)	2 years ago
cli_helper.rb	Fix opening and closing Redis connections instead of using a pool (#18171)	3 years ago
domains_cli.rb	Add --by-uri option to `tootctl domains purge` (#16434)	3 years ago
email_domain_blocks_cli.rb	Fix tootctl email_domain_blocks add (#17842)	3 years ago
emoji_cli.rb	Enable importing GIF emojis in CLI (#17706)	3 years ago
feeds_cli.rb	Fix single Redis connection being used across all threads (#18135)	3 years ago
ip_blocks_cli.rb	Fix tootctl ip_blocks add failing if not given a comment (#15263)	4 years ago
maintenance_cli.rb	Fix wrong language code for Kurdish languages (#17812)	3 years ago
media_cli.rb	Fix Ambiguous SQL error on tootctl media refresh (#19206)	2 years ago
migration_helpers.rb	Fix migration error handling (#17991)	3 years ago
premailer_webpack_strategy.rb	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	7 years ago
preview_cards_cli.rb	Change tootctl to use inline parallelization instead of Sidekiq (#11776)	5 years ago
rack_middleware.rb	Fix opening and closing Redis connections instead of using a pool (#18171)	3 years ago
redis_config.rb	Fix single Redis connection being used across all threads (#18135)	3 years ago
search_cli.rb	Fix typos (#18604)	2 years ago
settings_cli.rb	Add ability to set approval-based registration through tootctl (#18248)	3 years ago
sidekiq_middleware.rb	Fix opening and closing Redis connections instead of using a pool (#18171)	3 years ago
snowflake.rb	Add trending links (#16917)	3 years ago
statuses_cli.rb	Spelling (#17705)	3 years ago
upgrade_cli.rb	Fix `tootctl upgrade storage-schema` S3 ACL (#13768)	5 years ago
version.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago