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

2024-01-18 09:17:39 +09:00 · 2024-01-18 09:17:39 +09:00 · 2b51fabe9c
commit 2b51fabe9c
parent f20ebfac41 127503eb2c
397 changed files with 2899 additions and 3252 deletions
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@ -105,7 +105,7 @@ module Mastodon::CLI
      if user.save
        if options[:confirmed]
          user.confirmed_at = nil
-          user.confirm!
+          user.mark_email_as_confirmed!
        end

        user.approve! if options[:approve]