me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Merge upstream changes
This commit is contained in:
Claire 2023-09-19 17:38:05 +02:00 committed by GitHub
commit ffd10e0f65
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
View file

@ -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

2
lib/mastodon/migration_helpers.rb
View file

@ -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.