Claire 2f491f0d48 Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6 ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version.
   Did it as well.

2026-06-23 18:01:59 +02:00

..

action_dispatch

Update RemoteIp patch with Rails 8.1 changes (#38139)

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

active_record

Fix behavior of database schema loading with SKIP_POST_DEPLOYMENT_MIGRATIONS (#34089)

2025-03-07 13:41:16 +00:00

assets

…

chewy

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

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

devise/strategies

Fix parameter validation in our custom devise strategies (#33754)

2025-01-28 08:21:59 +00:00

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 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6

2026-06-23 18:01:59 +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 '0529a1f7d2197dd535f59163c00634f9c060723d' into glitch-soc/merge-upstream

2026-06-03 14:42:51 +02:00

simple_navigation

…

tasks

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

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

templates/haml/scaffold

Use tt extension for form scaffold template (#29676)

2024-04-10 09:20:21 +00:00

terrapin

…

vite_ruby

Fix not importing stylesheet recursively (#39254)

2026-06-02 15:23:52 +00:00

exceptions.rb

Fix synchronous recursive fetching of deeply-nested quoted posts (#35600)

2025-07-30 14:39:30 +00:00

premailer_bundled_asset_strategy.rb

Fix premailer strategy when using CDN_HOST (#34813)

2025-05-26 13:19:19 +00:00