Claire bf153b384b Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/auth/passwords_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict.		2024-01-27 19:06:41 +01:00
..
cli	Extract rebuild_index method in maintenance CLI (#28911)	2024-01-25 15:26:51 +00:00
migration_helpers.rb	Update links to upstream migration helpers, remove unused methods (#28781)	2024-01-18 12:29:54 +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	Enable Rails 7.1 Marshalling format (#28609)	2024-01-05 21:57:47 +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