Claire f5b7307890 Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines.		2023-12-21 19:24:10 +01: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/strategies	Move lib/devise/* to lib/devise/strategies/* (#27638)	2023-11-29 10:10:21 +00:00
generators/post_deployment_migration	…
linter	…
mastodon	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream	2023-12-21 19:24:10 +01:00
paperclip	Fix division by zero in video in bitrate computation code (#27129)	2023-09-25 17:07:52 +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 commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01:00
simple_navigation	…
tasks	Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream	2023-12-19 20:40:05 +01: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
premailer_webpack_strategy.rb	Move lib/mastodon/premailer_webpack_strategy to lib/ (#27636)	2023-11-29 10:08:55 +00:00
public_file_server_middleware.rb	…