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 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.		2 years ago
..
accounts_cli.rb	Autofix Rubocop Style/RedundantBegin (#23703)	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	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
domains_cli.rb	Autofix Rubocop Style/RescueStandardError (#23745)	2 years ago
email_domain_blocks_cli.rb	Fix tootctl email_domain_blocks add (#17842)	3 years ago
emoji_cli.rb	Enable Rubocop Style/StringConcatenation defaults (#23792)	2 years ago
feeds_cli.rb	Fix single Redis connection being used across all threads (#18135)	3 years ago
ip_blocks_cli.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
maintenance_cli.rb	Autofix Rubocop Style/FormatString (#23743)	2 years ago
media_cli.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
migration_helpers.rb	Enable Lint/RedundantCopDisableDirective (#23687)	2 years ago
premailer_webpack_strategy.rb	Autofix Rubocop Rails/RootPathnameMethods (#23760)	2 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	Enable Rubocop Style/StringConcatenation defaults (#23792)	2 years ago
search_cli.rb	Autofix Rubocop Style/RedundantBegin (#23703)	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	Enable Rubocop Style/StringConcatenation defaults (#23792)	2 years ago
statuses_cli.rb	Apply Rubocop Performance/StringIdentifierArgument (#23444)	2 years ago
upgrade_cli.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
version.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago