Jeremy Kescher 2cb88f5baa Merge remote-tracking branch 'upstream/main' into develop ... Conflicts: - .github/workflows/build-image.yml We don't use GitHub Actions for building Docker images. - Gemfile.lock Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.		2023-03-19 01:57:28 +01: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	Fix Redis warnings regarding version 5.0.0	2022-12-04 22:35:48 +01:00
devise
generators
json_ld
mastodon	Merge remote-tracking branch 'upstream/main' into develop	2023-03-19 01:57:28 +01: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	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-05 20:46:56 +01:00
simple_navigation	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01: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