Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.		2023-03-16 23:12:59 +01:00
..
accounts_cli.rb	Add refreshing many accounts at once with "tootctl accounts refresh" (#23304)	2023-03-08 17:06:53 +01: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 admin API for managing canonical e-mail blocks (#19067)	2022-08-28 03:31:54 +02:00
cli_helper.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
domains_cli.rb	Autofix Rubocop Style/RescueStandardError (#23745)	2023-02-20 11:01:20 +01: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 Rubocop Style/StringConcatenation defaults (#23792)	2023-02-22 09:54:36 +09:00
feeds_cli.rb	Upgrade to latest redis-rb 4.x and fix deprecations (#23616)	2023-03-04 16:38:28 +01:00
ip_blocks_cli.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
maintenance_cli.rb	Autofix Rubocop Style/FormatString (#23743)	2023-02-20 07:58:33 +01:00
media_cli.rb	Regen rubocop-todo without Max shadowing (#24076)	2023-03-16 12:31:08 +09:00
migration_helpers.rb	Enable Lint/RedundantCopDisableDirective (#23687)	2023-02-18 04:30:14 +01:00
premailer_webpack_strategy.rb	Autofix Rubocop Rails/RootPathnameMethods (#23760)	2023-02-22 09:57:15 +09: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	Enable Rubocop Style/StringConcatenation defaults (#23792)	2023-02-22 09:54:36 +09:00
search_cli.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09: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 sidekiq jobs not triggering Elasticsearch index updates (#24046)	2023-03-12 23:47:55 +01:00
snowflake.rb	Enable Rubocop Style/StringConcatenation defaults (#23792)	2023-02-22 09:54:36 +09:00
statuses_cli.rb	Apply Rubocop Performance/StringIdentifierArgument (#23444)	2023-02-08 02:36:20 +01:00
upgrade_cli.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
version.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-10 22:49:59 +01:00