Claire 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed how the nightly builds are versioned, the conflict is because glitch-soc modified adjacent lines relative to the docker repositories the images are pushed to. Applied upstream's changes. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream moved some settings around. Glitch-soc had more settings. Applied upstream's changes, moving glitch-soc's extra settings accordingly.		2023-08-24 21:56:00 +02:00
..
cli	Fix ES_PRESET not being applied to Chewy's internal index (#26489)	2023-08-14 19:00:56 +02:00
migration_helpers.rb	Fix adding column with default value taking longer on Postgres >= 11 (#26375)	2023-08-08 09:09:58 +02: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 '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream	2023-08-24 21:56:00 +02:00