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

This commit is contained in:
KMY 2024-05-10 06:40:33 +09:00
commit 10eec0e102
40 changed files with 365 additions and 88 deletions

View file

@ -6,7 +6,7 @@ Rake::Task['db:encryption:init'].clear
namespace :db do
namespace :encryption do
desc 'Generate a set of keys for configuring Active Record encryption in a given environment'
task init: :environment do
task :init do # rubocop:disable Rails/RakeEnvironment
puts <<~MSG
Add these environment variables to your Mastodon environment:#{' '}