diff --git a/app/models/concerns/account/merging.rb b/app/models/concerns/account/merging.rb index f63fee596e0..336904c2ff3 100644 --- a/app/models/concerns/account/merging.rb +++ b/app/models/concerns/account/merging.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -# TODO: remove some time after 4.7.0 +# TODO: remove after 5.0.0 module Account::Merging extend ActiveSupport::Concern diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb index 7f15a3686ed..86d663c793e 100644 --- a/lib/mastodon/cli/accounts.rb +++ b/lib/mastodon/cli/accounts.rb @@ -250,16 +250,6 @@ module Mastodon::CLI say('OK', :green) end - desc 'fix-duplicates', 'Find duplicate remote accounts and merge them' - option :dry_run, type: :boolean - long_desc <<-LONG_DESC - This command is deprecated as of Mastodon v4.7.0. - LONG_DESC - def fix_duplicates - # TODO: remove this after 4.7.0 - say('This command is deprecated as Mastodon v4.7.0 migrations enforce ActivityPub actor identifier uniqueness', :yellow) - end - desc 'backup USERNAME', 'Request a backup for a user' long_desc <<-LONG_DESC Request a new backup for an account with a given USERNAME.