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

..

action_dispatch

Update RemoteIp patch with Rails 8.1 changes (#38139)

2026-03-11 09:51:49 +00:00

active_record

…

assets

…

chewy

Fix invalid arguments being passed to Redis in custom Chewy strategy (#38684)

2026-04-15 09:54:38 +00:00

devise/strategies

…

elasticsearch

Update chewy to version 8.0.1 (#37983)

2026-03-17 13:27:37 +00:00

generators/post_deployment_migration

…

linter

…

mastodon

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

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

paperclip

Rename deprecated ffmpeg vsync arg to fps_mode (#38198)

2026-03-17 15:44:50 +00:00

rails

…

sanitize_ext

Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream

2026-05-22 19:43:42 +02:00

simple_navigation

…

tasks

Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream

2026-05-19 20:40:57 +02:00

templates/haml/scaffold

…

terrapin

…

vite_ruby

Convert mix of JSON.parse and JSON.load_file (#38242)

2026-03-17 13:27:57 +00:00

exceptions.rb

…

premailer_bundled_asset_strategy.rb

…