Jeremy Kescher caccc2e0f4 Merge branch 'glitch-soc' into develop ... # Conflicts: # README.md # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/reducers/compose.js # app/javascript/flavours/glitch/styles/components.scss # app/javascript/mastodon/reducers/compose.js # app/models/notification.rb		2024-03-14 20:01:30 +01:00
..
cli	Use existing MediaAttachment.remote scope in media CLI (#28912)	2024-01-30 15:29:42 +00:00
migration_helpers.rb	Use unchanging github links in docs/comments (#29545)	2024-03-11 15:14:55 +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-03-14 20:01:30 +01:00