Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.		2023-12-20 22:16:50 +01:00
..
cli	Remove useless `reorder(nil)` call in `tootctl statuses` (#28141)	2023-12-07 09:41:00 +00:00
migration_helpers.rb	Capture minimum postgres version 12 (#27528)	2023-10-26 20:35:15 +00:00
migration_warning.rb	Migration warning helper, and only run in production env (#24253)	2023-03-26 00:39:24 +01: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	Fix cache store pool config deprecation warnings (#27551)	2023-10-25 12:01:21 +00:00
sidekiq_middleware.rb	Do not truncate backtrace when the `BACKTRACE` env variable is set (#26794)	2023-09-06 09:18:10 +02:00
snowflake.rb	Fix `Style/SelfAssignment` cop (#28171)	2023-12-01 15:52:52 +00:00
version.rb	Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream	2023-10-08 16:30:00 +02:00