Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream

2025-02-18 20:38:57 +01:00
parent e0b7ecfb0b f1d4be1e75
commit f3bc50778b
48 changed files with 1053 additions and 896 deletions
@@ -289,6 +289,16 @@ module Mastodon::CLI
      fail_with_message 'Invalid URL'
    end

+    PRELOADED_MODELS = %w(
+      Account
+      Backup
+      CustomEmoji
+      Import
+      MediaAttachment
+      PreviewCard
+      SiteUpload
+    ).freeze
+
    private

    def object_storage_summary
@@ -310,16 +320,6 @@ module Mastodon::CLI
      SQL
    end

-    PRELOADED_MODELS = %w(
-      Account
-      Backup
-      CustomEmoji
-      Import
-      MediaAttachment
-      PreviewCard
-      SiteUpload
-    ).freeze
-
    def preload_records_from_mixed_objects(objects)
      preload_map = Hash.new { |hash, key| hash[key] = [] }