Claire ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.

2026-05-30 12:13:35 +02:00

..

cli

Improve resilience of tootctl maintenance fix-duplicates command (#38501)

2026-04-01 09:08:15 +00:00

middleware

Add specs for PublicFileServer middleware (#35219)

2025-06-30 11:23:11 +00:00

prometheus_exporter

Start local prometheus_exporter server only in puma/sidekiq startup (#35005)

2025-06-11 13:37:59 +00:00

database.rb

…

email_configuration_helper.rb

Fix SMTP configuration with mail 2.9.0 (#36646)

2025-10-30 11:21:32 +00:00

feature.rb

…

migration_helpers.rb

…

migration_warning.rb

Update rubocop to version 1.76.0 (#34926)

2025-06-05 12:09:05 +00:00

redis_configuration.rb

Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795)

2026-02-17 14:56:46 +00:00

sidekiq_middleware.rb

…

snowflake.rb

…

version.rb

Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream

2026-05-30 12:13:35 +02:00

worker_batch_middleware.rb

Fix jobs being added to batch after they might already execute (#35496)

2025-07-28 08:20:12 +00:00