Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
accounts_cli.rb	Add optional domain restrict to tootctl accounts cull (#16511)	2021-10-14 21:09:56 +02:00
cache_cli.rb	…
cli_helper.rb	…
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	Skip blocked domains media on tootctl media refresh (#16914)	2021-10-28 19:30:44 +02:00
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	Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915)	2021-11-18 22:02:08 +01:00
settings_cli.rb	…
snowflake.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
statuses_cli.rb	…
upgrade_cli.rb	…
version.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-13 09:40:13 +01:00