Merge branch 'main' into glitch-soc/merge-upstream

db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb

@@ -18,7 +18,7 @@ class AddUniqueIndexOnPreviewCardsStatuses < ActiveRecord::Migration[6.1]
   def supports_concurrent_reindex?
     @supports_concurrent_reindex ||= begin
       version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-      version >= 12_000
+      version >= 120_000
     end
   end
 

lib/mastodon/migration_helpers.rb

@@ -202,7 +202,7 @@ module Mastodon
     def supports_add_column_with_default?
       version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
 
-      version >= 11_000
+      version >= 110_000
     end
 
     # Adds a foreign key with only minimal locking on the tables involved.