nyastodon/lib/mastodon
Claire 1a664560cc Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  We deleted it.
  Kept it removed.
- `app/javascript/packs/public.jsx`:
  Upstream changed an import, we have slightly different ones.
  Ported upstream changes.
2023-05-09 23:12:48 +02:00
..
accounts_cli.rb Fix Rails/DeprecatedActiveModelErrorsMethods cop (#24742) 2023-05-02 18:39:22 +02: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 Fix crash in tootctl commands making use of parallelization when Elasticsearch is enabled (#24182) 2023-03-20 20:02:58 +01:00
domains_cli.rb Autofix Rubocop Style/RescueStandardError (#23745) 2023-02-20 11:01:20 +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 Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml (#24469) 2023-05-04 11:56:24 +02:00
feeds_cli.rb Upgrade to latest redis-rb 4.x and fix deprecations (#23616) 2023-03-04 16:38:28 +01:00
ip_blocks_cli.rb Add ability to block sign-ups from IP using the CLI (#24870) 2023-05-09 14:46:00 +02:00
maintenance_cli.rb Fix Lint/DuplicateBranch cop (#24766) 2023-05-02 12:57:11 +02:00
media_cli.rb Fix Performance/CollectionLiteralInLoop cop (#24819) 2023-05-04 05:33:55 +02:00
migration_helpers.rb Enable Lint/RedundantCopDisableDirective (#23687) 2023-02-18 04:30:14 +01:00
migration_warning.rb Migration warning helper, and only run in production env (#24253) 2023-03-26 00:39:24 +01:00
premailer_webpack_strategy.rb Autofix Rubocop Rails/RootPathnameMethods (#23760) 2023-02-22 09:57:15 +09: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 Update redis_config.rb to remove warning message (#24352) 2023-04-02 06:49:37 +02: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 sidekiq jobs not triggering Elasticsearch index updates (#24046) 2023-03-12 23:47:55 +01:00
snowflake.rb Fix Rails/SquishedSQLHeredocs cop (#24694) 2023-04-30 06:43:50 +02: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 commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00