Claire b6b68b44a1 Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream ... Conflicts: - `Vagrantfile`: Upstream bumped a bunch of values, including one that was already bumped by glitch-soc. Took upstream's version. - `lib/paperclip/transcoder.rb`: glitch-soc already had a partial fix for this. Took upstream's version.		2023-08-24 21:46:17 +02:00
..
active_record	Fix Style/SlicingWithRange cop (#25923)	2023-07-12 10:03:06 +02:00
assets
chewy	Add ES_PRESET option to customize numbers of shards and replicas (#26483)	2023-08-14 17:46:16 +02:00
devise
generators/post_deployment_migration
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 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream	2023-08-24 21:03:56 +02:00
paperclip	Fix unexpected audio stream transcoding when uploaded video is eligible to passthrough (#26608)	2023-08-23 08:44:56 +02:00
rails	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
redis	Update rubocop and rubocop-rspec (#26329)	2023-08-22 09:31:40 +02:00
sanitize_ext	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-06 15:16:34 +02:00
simple_navigation
tasks	Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream	2023-08-21 21:07:39 +02:00
templates/haml/scaffold
terrapin
webpacker	Fix the crossorigin attribute (#26096)	2023-07-21 11:14:26 +02:00
exceptions.rb
http_extensions.rb	Fix already initialized constant warning (#26542)	2023-08-18 16:06:46 +02:00
public_file_server_middleware.rb	Add hardened headers to user-uploaded files (#25756)	2023-07-06 14:31:37 +02:00