Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream ...

Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.

2024-05-01 19:38:34 +02:00

..

active_record

Rails 7.1 update (#25963)

2023-10-23 17:58:29 +00:00

assets

…

chewy

Add ES_PRESET option to customize numbers of shards and replicas (#26483)

2023-08-14 17:46:16 +02:00

devise/strategies

Move lib/devise/* to lib/devise/strategies/* (#27638)

2023-11-29 10:10:21 +00:00

generators/post_deployment_migration

…

linter

…

mastodon

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

2024-05-01 19:30:41 +02:00

paperclip

Update stoplight to version 4.1.0 (#28366)

2024-04-02 15:47:40 +00:00

rails

…

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 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream

2024-05-01 19:38:34 +02:00

templates/haml/scaffold

Use tt extension for form scaffold template (#29676)

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

terrapin

…

webpacker

Fix Style/SingleArgumentDig cop in webpacker/manifest_extensions (#29929)

2024-04-15 09:15:32 +00:00

exceptions.rb

…

http_extensions.rb

Fix already initialized constant warning (#26542)

2023-08-18 16:06:46 +02:00

premailer_bundled_asset_strategy.rb

Rename PremailerWebpackStrategy -> PremailerBundledAssetStrategy (#29934)

2024-04-15 09:16:59 +00:00

public_file_server_middleware.rb

…