Change deduplication order of tootctl maintenance fix-duplicates (#15923)
Hopefully fixes #15922 Also update support up to latest database schema version
This commit is contained in:
		@@ -14,7 +14,7 @@ module Mastodon
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    MIN_SUPPORTED_VERSION = 2019_10_01_213028
 | 
			
		||||
    MAX_SUPPORTED_VERSION = 2020_12_18_054746
 | 
			
		||||
    MAX_SUPPORTED_VERSION = 2021_03_08_133107
 | 
			
		||||
 | 
			
		||||
    # Stubs to enjoy ActiveRecord queries while not depending on a particular
 | 
			
		||||
    # version of the code/database
 | 
			
		||||
@@ -142,7 +142,6 @@ module Mastodon
 | 
			
		||||
      @prompt.warn 'Please make sure to stop Mastodon and have a backup.'
 | 
			
		||||
      exit(1) unless @prompt.yes?('Continue?')
 | 
			
		||||
 | 
			
		||||
      deduplicate_accounts!
 | 
			
		||||
      deduplicate_users!
 | 
			
		||||
      deduplicate_account_domain_blocks!
 | 
			
		||||
      deduplicate_account_identity_proofs!
 | 
			
		||||
@@ -157,6 +156,7 @@ module Mastodon
 | 
			
		||||
      deduplicate_media_attachments!
 | 
			
		||||
      deduplicate_preview_cards!
 | 
			
		||||
      deduplicate_statuses!
 | 
			
		||||
      deduplicate_accounts!
 | 
			
		||||
      deduplicate_tags!
 | 
			
		||||
      deduplicate_webauthn_credentials!
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user