Merge pull request #2417 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
glitch-soc · Sep 19, 2023 · 5efa6ac · 5efa6ac
2 parents 57f47e5 + 6a9e93a
commit 5efa6ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb b/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
@@ -18,7 +18,7 @@ def down
   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
 

diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
@@ -202,7 +202,7 @@ def supports_drop_index_concurrently?
     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.