Claire 487c814eb9 Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.

2026-05-22 19:43:42 +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

Upgrade to Stylelint 15 with Prettier (#23558)

2023-02-13 04:57:03 +01:00

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

Clean up the post deployment migration generator (#24233)

2023-04-11 11:25:29 +02:00

linter

Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)

2023-06-02 19:58:18 +02:00

mastodon

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

2026-05-20 15:43:33 +02:00

paperclip

Rename deprecated ffmpeg vsync arg to fps_mode (#38198)

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

rails

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

sanitize_ext

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

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

simple_navigation

Add customizable user roles (#18641)

2022-07-05 02:41:40 +02:00

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

Autofix Rubocop Style/HashSyntax (#23754)

2023-05-04 05:54:26 +02:00

vite_ruby

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

2026-03-17 13:27:57 +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