Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly.		2025-01-10 20:41:36 +01:00
..
cli	Set statement timeout to zero in maintenance CLI (#33484)	2025-01-07 14:11:12 +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	Refactor (ruby) redis configuration (#31694)	2024-09-02 14:19:55 +00:00
redis_configuration.rb	Add credentials to redis sentinel configuration (#31768)	2024-09-05 14:06:58 +00:00
sidekiq_middleware.rb	Add support for Active Record query log tags (#33342)	2024-12-18 10:05:00 +00:00
snowflake.rb	Fix `Style/SelfAssignment` cop (#28171)	2023-12-01 15:52:52 +00:00
version.rb	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01:00