Jeremy Kescher 009251a17d Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/initial_state.js # app/serializers/initial_state_serializer.rb # config/initializers/chewy.rb # config/locales/en.yml # config/locales/ja.yml		2024-02-24 19:11:05 +01:00
..
cli	Use existing MediaAttachment.remote scope in media CLI (#28912)	2024-01-30 15:29:42 +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 branch 'glitch-soc' into develop	2024-02-24 17:51:18 +01:00