Merge commit '38e7bb9b866b5d207a511de093de25536f13e9c4' into glitch-soc/merge-4.5

lib/mastodon/cli/maintenance.rb

@@ -26,7 +26,6 @@ module Mastodon::CLI
     class ListAccount < ApplicationRecord; end
     class PollVote < ApplicationRecord; end
     class Mention < ApplicationRecord; end
-    class Notification < ApplicationRecord; end
     class NotificationPermission < ApplicationRecord; end
     class NotificationRequest < ApplicationRecord; end
     class AccountDomainBlock < ApplicationRecord; end
@@ -40,8 +39,6 @@ module Mastodon::CLI
     class CanonicalEmailBlock < ApplicationRecord; end
     class Appeal < ApplicationRecord; end
     class Webhook < ApplicationRecord; end
-    class BulkImport < ApplicationRecord; end
-    class SoftwareUpdate < ApplicationRecord; end
     class SeveredRelationship < ApplicationRecord; end
     class TagFollow < ApplicationRecord; end
 
@@ -58,6 +55,18 @@ module Mastodon::CLI
       self.inheritance_column = nil
     end
 
+    class Notification < ApplicationRecord
+      self.inheritance_column = nil
+    end
+
+    class BulkImport < ApplicationRecord
+      self.inheritance_column = nil
+    end
+
+    class SoftwareUpdate < ApplicationRecord
+      self.inheritance_column = nil
+    end
+
     class AccountStat < ApplicationRecord
       belongs_to :account, inverse_of: :account_stat
     end

lib/mastodon/version.rb

@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      7
+      8
     end
 
     def default_prerelease