Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.

2023-04-09 11:45:08 +02:00

..

active_record

Apply Rubocop Performance/BindCall (#23437)

2023-02-08 09:10:25 +09:00

assets

Upgrade to Stylelint 15 with Prettier (#23558)

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

chewy/strategy

Change root Chewy strategy to emit a warning instead of erroring out in production mode (#24327)

2023-04-03 15:05:39 +02:00

devise

…

generators

…

json_ld

…

mastodon

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-09 11:45:08 +02:00

paperclip

Merge branch 'main' into glitch-soc/merge-upstream

2023-02-25 14:00:40 +01:00

rails

Autofix Rubocop Style/StringLiterals (#23695)

2023-02-19 07:38:14 +09:00

redis

…

sanitize_ext

Fix most rubocop issues (#2165)

2023-04-09 11:25:30 +02:00

simple_navigation

…

tasks

Fix most rubocop issues (#2165)

2023-04-09 11:25:30 +02:00

templates

…

terrapin

…

webpacker

…

cli.rb

Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034)

2023-03-15 03:45:15 +01:00

exceptions.rb

Fix error when passing unknown filter param in REST API (#20626)

2022-11-14 08:06:06 +01:00

public_file_server_middleware.rb

Add cache headers to static files served through Rails (#24120)

2023-03-16 02:55:54 +01:00