catstodon/lib/mastodon
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
2023-07-30 16:11:55 +02:00
..
cli Storage: add :azure to remaining callers (#26080) 2023-07-27 16:13:45 +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 commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02:00