Claire 80af1ea434 Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because of different theming system.
  Adapted upstream's changes.
- `vite.config.mts`:
  Conflict because of different theming system.
  Adapted upstream's changes.

2025-06-12 20:32:25 +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

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

2025-06-11 13:37:59 +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

stoplight

Fix compatibility with Redis < 6.2 again (#30412)

2024-06-19 16:59:37 +00:00

tasks

Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream

2025-06-05 18:02:40 +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 theme name requirement regression with efficient lookup by name (#35007)

2025-06-12 14:09:45 +00:00

exceptions.rb

Refactoring: Move SignatureVerificationError into Mastodon namespace (#34342)

2025-04-02 07:54:29 +00:00

premailer_bundled_asset_strategy.rb

Fix premailer strategy when using CDN_HOST (#34813)

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