Merge remote-tracking branch 'parent/main' into upstream-20240507

2024-05-07 08:05:04 +09:00 · 2024-05-07 08:05:04 +09:00 · 89b71363ae
commit 89b71363ae
parent bab1a792a7 6167894547
70 changed files with 1739 additions and 445 deletions
--- a/config/initializers/active_record_encryption.rb
+++ b/config/initializers/active_record_encryption.rb
@ -6,9 +6,9 @@
  ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
 ).each do |key|
  ENV.fetch(key) do
-    raise <<~MESSAGE
+    abort <<~MESSAGE

-      The ActiveRecord encryption feature requires that these variables are set:
+      Mastodon now requires that these variables are set:

        - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
        - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT