Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream changes #2417

Merged
merged 2 commits into from
Sep 19, 2023
Merged

Merge upstream changes #2417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abcc0b3
Fix incorrect PostgreSQL version check (#26979)
ClearlyClaire Sep 19, 2023
6a9e93a
Merge branch 'main' into glitch-soc/merge-upstream
ClearlyClaire Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion lib/mastodon/migration_helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down