1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-14 14:49:01 +09:00
YuruToot/lib/mastodon
Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them.
2023-02-19 10:42:55 +01:00
..
accounts_cli.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
cache_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
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 Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
domains_cli.rb Autofix Rubocop Style/Lambda (#23696) 2023-02-18 12:39:00 +01:00
email_domain_blocks_cli.rb Fix tootctl email_domain_blocks add (#17842) 2022-03-21 19:10:09 +01:00
emoji_cli.rb Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
feeds_cli.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
ip_blocks_cli.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
maintenance_cli.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
media_cli.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
migration_helpers.rb Enable Lint/RedundantCopDisableDirective (#23687) 2023-02-18 04:30:14 +01:00
premailer_webpack_strategy.rb Apply Rubocop Rails/RootPublicPath (#23447) 2023-02-08 10:38:07 +01:00
preview_cards_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
rack_middleware.rb Fix opening and closing Redis connections instead of using a pool (#18171) 2022-04-29 22:43:07 +02:00
redis_config.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
search_cli.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
settings_cli.rb Add ability to set approval-based registration through tootctl (#18248) 2022-05-02 17:41:34 +02:00
sidekiq_middleware.rb Fix opening and closing Redis connections instead of using a pool (#18171) 2022-04-29 22:43:07 +02:00
snowflake.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
statuses_cli.rb Apply Rubocop Performance/StringIdentifierArgument (#23444) 2023-02-08 02:36:20 +01:00
upgrade_cli.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
version.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 22:49:59 +01:00