Claire 4b0fb764c3 Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream ... Conflicts and ported changes: - updated `@rails/ujs` imports		2023-10-24 19:59:19 +02:00
..
active_record	Rails 7.1 update (#25963)	2023-10-23 17:58:29 +00: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 '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream	2023-10-24 19:31:14 +02:00
paperclip	Fix division by zero in video in bitrate computation code (#27129)	2023-09-25 17:07:52 +02:00
rails	…
redis	Update rubocop and rubocop-rspec (#26329)	2023-08-22 09:31:40 +02:00
sanitize_ext	…
simple_navigation	…
tasks	Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream	2023-10-24 19:21:01 +02:00
templates/haml/scaffold	…
terrapin	…
webpacker	…
exceptions.rb	…
http_extensions.rb	Fix already initialized constant warning (#26542)	2023-08-18 16:06:46 +02:00
public_file_server_middleware.rb	…