Claire ab59743c13 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.

2023-01-14 22:34:09 +01:00

..

accounts_cli.rb

Implement tootctl accounts prune (#18397)

2023-01-13 22:34:16 +01:00

cache_cli.rb

…

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

…

domains_cli.rb

Fix crash and incorrect behavior in tootctl domains crawl (#19004)

2022-12-13 20:02:32 +01:00

email_domain_blocks_cli.rb

…

emoji_cli.rb

…

feeds_cli.rb

…

ip_blocks_cli.rb

…

maintenance_cli.rb

Fix index name in fix-duplicates task (#20632)

2022-11-14 08:33:48 +01:00

media_cli.rb

Add command to remove avatar and header images of inactive remote accounts from the local database (#22149)

2022-12-14 19:50:07 +01:00

migration_helpers.rb

…

premailer_webpack_strategy.rb

…

preview_cards_cli.rb

…

rack_middleware.rb

…

redis_config.rb

Add logging for Rails cache timeouts (#21667)

2022-11-27 20:37:37 +01:00

search_cli.rb

Fix typos (#18604)

2022-08-28 17:44:34 +02:00

settings_cli.rb

…

sidekiq_middleware.rb

…

snowflake.rb

…

statuses_cli.rb

…

upgrade_cli.rb

…

version.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-11-16 08:30:00 +01:00