mastodon/lib/mastodon
Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +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 Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02: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 Fix tootctl not allocating enough database connections for main thread (#12097) 2019-10-07 05:05:02 +02:00
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 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 ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372) 2018-01-29 01:06:39 +01:00
preview_cards_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
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 Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
snowflake.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
statuses_cli.rb Add remove orphans to tootctl statuses remove (#17067) 2021-12-12 06:09:14 +01:00
upgrade_cli.rb Fix `tootctl upgrade storage-schema` S3 ACL (#13768) 2020-05-17 17:27:36 +02:00
version.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-13 09:40:13 +01:00