Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components.		2023-06-10 16:22:14 +02:00
..
action_controller	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
active_record	…
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/post_deployment_migration	Clean up the post deployment migration generator (#24233)	2023-04-11 11:25:29 +02:00
json_ld	…
linter	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	2023-06-02 19:58:18 +02:00
mastodon	Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream	2023-06-10 15:17:08 +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	…
sanitize_ext	Fix rubocop issues in glitch-soc-specific code	2023-05-08 19:28:43 +02:00
simple_navigation	…
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2023-05-28 17:01:25 +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	…
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