Claire 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed how the nightly builds are versioned, the conflict is because glitch-soc modified adjacent lines relative to the docker repositories the images are pushed to. Applied upstream's changes. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream moved some settings around. Glitch-soc had more settings. Applied upstream's changes, moving glitch-soc's extra settings accordingly.		2023-08-24 21:56:00 +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
mastodon	Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream	2023-08-24 21:56:00 +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