Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		2021-07-08 16:17:19 +02:00
..
accounts_cli.rb	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +02:00
cache_cli.rb
cli_helper.rb	Fix DB connection pool settings in CLI (#15983)	2021-03-31 17:46:17 +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
emoji_cli.rb
feeds_cli.rb
ip_blocks_cli.rb
maintenance_cli.rb	Fix account deletion sometimes failing because of optimistic locks (#16317)	2021-06-02 17:41:25 +02:00
media_cli.rb
migration_helpers.rb	Fix migration script not being able to run if it fails midway (#16312)	2021-06-02 19:15:17 +02:00
premailer_webpack_strategy.rb
preview_cards_cli.rb
redis_config.rb	Add a Redis environment variable for sidekiq (#16188)	2021-05-09 10:40:17 +02:00
search_cli.rb	Fix tootctl search deploy on Ruby 3 (#16346)	2021-06-01 17:31:49 +02:00
settings_cli.rb
snowflake.rb
statuses_cli.rb
upgrade_cli.rb
version.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-03 20:47:02 +02:00