Claire 1a664560cc Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: We deleted it. Kept it removed. - `app/javascript/packs/public.jsx`: Upstream changed an import, we have slightly different ones. Ported upstream changes.		2023-05-09 23:12:48 +02:00
..
action_controller	Refactor Cache-Control and Vary definitions (#24347)	2023-04-19 16:07:29 +02:00
active_record
assets
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	Fix authentication before 2FA challenge (#11943)	2019-09-24 04:35:36 +02:00
generators/post_deployment_migration	Clean up the post deployment migration generator (#24233)	2023-04-11 11:25:29 +02:00
json_ld
mastodon	Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream	2023-05-09 23:12:48 +02:00
paperclip	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2023-05-08 19:28:21 +02:00
rails	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	2020-07-01 19:05:21 +02:00
sanitize_ext	Fix rubocop issues in glitch-soc-specific code	2023-05-08 19:28:43 +02:00
simple_navigation
tasks	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream	2023-05-08 15:28:36 +02:00
templates/haml/scaffold	Clean up the post deployment migration generator (#24233)	2023-04-11 11:25:29 +02:00
terrapin	Autofix Rubocop Style/HashSyntax (#23754)	2023-05-04 05:54:26 +02:00
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
public_file_server_middleware.rb	Add cache headers to static files served through Rails (#24120)	2023-03-16 02:55:54 +01:00