mastodon/lib
Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
2024-06-17 18:30:28 +02:00
..
action_dispatch Merge pull request from GHSA-c2r5-cfqr-c553 2024-05-30 14:24:29 +02:00
active_record Add experimental server-side notification grouping (#29889) 2024-06-03 08:35:59 +00:00
arel Add experimental server-side notification grouping (#29889) 2024-06-03 08:35:59 +00:00
assets Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
chewy Add `ES_PRESET` option to customize numbers of shards and replicas (#26483) 2023-08-14 17:46:16 +02:00
devise/strategies Disable `Style/SignalException` cop (#30064) 2024-04-29 12:32:06 +00:00
elasticsearch Fix OpenSearch compatibility issue (#30278) 2024-05-14 17:54:28 +00:00
generators/post_deployment_migration
linter Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
mastodon Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 2024-06-17 18:30:28 +02:00
paperclip Fix libvips color extraction when multiple maxima differ only on blue component (#30632) 2024-06-11 13:58:10 +00:00
rails Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
redis Update rubocop and rubocop-rspec (#26329) 2023-08-22 09:31:40 +02:00
sanitize_ext Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 2023-12-17 23:04:16 +01:00
simple_navigation
tasks Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +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
webpacker Fix `Style/SingleArgumentDig` cop in webpacker/manifest_extensions (#29929) 2024-04-15 09:15:32 +00:00
exceptions.rb
premailer_bundled_asset_strategy.rb Rename `PremailerWebpackStrategy` -> `PremailerBundledAssetStrategy` (#29934) 2024-04-15 09:16:59 +00:00
public_file_server_middleware.rb Add hardened headers to user-uploaded files (#25756) 2023-07-06 14:31:37 +02:00