mastodon-glitch/lib/mastodon
Claire 3d25fe0426 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.
2022-02-23 18:13:12 +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
canonical_email_blocks_cli.rb Add ability for admins to delete canonical email blocks (#16644) 2021-12-17 23:02:14 +01:00
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 Fixed code quality issues (#15541) 2021-01-31 21:26:09 +01:00
emoji_cli.rb tootctl emoji import: case insensitive duplicate check (#15738) 2021-03-24 10:55:16 +01:00
feeds_cli.rb
ip_blocks_cli.rb Fix tootctl ip_blocks add failing if not given a comment (#15263) 2020-12-02 21:19:41 +01:00
maintenance_cli.rb Remove leftover database columns from Devise::Models::Rememberable (#17191) 2022-01-23 15:46:30 +01: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 edge case in migration helpers that caused crash because of PostgreSQL quirks (#17398) 2022-01-30 22:34:54 +01: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 ElasticSearch to Elasticsearch (#17050) 2021-11-26 08:30:02 +01:00
settings_cli.rb
snowflake.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
statuses_cli.rb Calculate max_id without random vector (#17623) 2022-02-23 16:44:59 +01:00
upgrade_cli.rb
version.rb Forward-port version bump to 3.4.6 (#17434) 2022-02-03 14:21:38 +01:00