mastodon/lib/mastodon
Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
..
cli Add coverage for CLI::Feeds command (#25319) 2023-06-10 18:37:36 +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 Fix Style/SlicingWithRange cop (#25923) 2023-07-12 10:03:06 +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
sidekiq_middleware.rb Fix sidekiq jobs not triggering Elasticsearch index updates (#24046) 2023-03-12 23:47:55 +01:00
snowflake.rb Refactor Snowflake to avoid brakeman sql injection warnings (#25879) 2023-07-12 10:44:58 +02:00
version.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-07-07 19:59:43 +02:00