Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.		2023-07-12 16:03:05 +02:00
..
action_controller	Refactor `Cache-Control` and `Vary` definitions (#24347)	2023-04-19 16:07:29 +02:00
active_record	Fix `Style/SlicingWithRange` cop (#25923)	2023-07-12 10:03:06 +02: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/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 '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
paperclip	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-06 15:16:34 +02:00
rails	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
redis	…
sanitize_ext	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-06 15:16:34 +02:00
simple_navigation	…
tasks	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +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	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 hardened headers to user-uploaded files (#25756)	2023-07-06 14:31:37 +02:00