Merge branch 'main' into glitch-soc/merge-upstream
2 files changed, 2 insertions(+), 2 deletions(-) M db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb M lib/mastodon/migration_helpers.rb
M db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb => db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb +1 -1
@@ 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
M lib/mastodon/migration_helpers.rb => lib/mastodon/migration_helpers.rb +1 -1