Claire e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream ...

Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.

2025-07-30 20:05:45 +02:00

..

action_dispatch

Merge pull request from GHSA-c2r5-cfqr-c553

2024-05-30 14:24:29 +02: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 tootctl search deploy --only-mapping not updating index settings (#34566)

2025-04-28 13:02:41 +00:00

devise/strategies

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

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

elasticsearch

Fix OpenSearch compatibility issue (#30278)

2024-05-14 17:54:28 +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

Add MediaAttachment.combined_media_file_size method (#35570)

2025-07-30 12:57:51 +00:00

paperclip

Fix Style/FormatStringToken cop (#34861)

2025-06-02 07:37:33 +00:00

rails

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

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

sanitize_ext

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

2025-05-25 15:11:58 +02:00

simple_navigation

Add customizable user roles (#18641)

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

tasks

Merge commit '6166e616389b051039dc76635048e2519271832a' into glitch-soc/merge-upstream

2025-06-24 20:45:46 +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

Fix crash in development environment with no prebuilt assets and no vite dev server running (#35177)

2025-06-25 14:20:07 +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