Commit b707b862 authored by Andreas Brandl's avatar Andreas Brandl

Remove check for >9.6 for Geo

The general requirement is >= PG 11 today, so we should be able to
expect >9.6 anyways.
parent dba80652
...@@ -8,10 +8,6 @@ class Admin::Geo::NodesController < Admin::Geo::ApplicationController ...@@ -8,10 +8,6 @@ class Admin::Geo::NodesController < Admin::Geo::ApplicationController
def index def index
@nodes = GeoNode.all.order(:id) @nodes = GeoNode.all.order(:id)
@node = GeoNode.new @node = GeoNode.new
unless Gitlab::Database.postgresql_minimum_supported_version?
flash.now[:warning] = _('Please upgrade PostgreSQL to version 9.6 or greater. The status of the replication cannot be determined reliably with the current version.')
end
end end
# rubocop: enable CodeReuse/ActiveRecord # rubocop: enable CodeReuse/ActiveRecord
......
...@@ -19,7 +19,6 @@ module Gitlab ...@@ -19,7 +19,6 @@ module Gitlab
def print_status def print_status
print_current_node_info print_current_node_info
print_postgres_version
print_gitlab_version print_gitlab_version
print_geo_role print_geo_role
...@@ -151,16 +150,6 @@ module Gitlab ...@@ -151,16 +150,6 @@ module Gitlab
end end
end end
def print_postgres_version
unless Gitlab::Database.postgresql_minimum_supported_version?
puts
puts 'WARNING: Please upgrade PostgreSQL to version 9.6 or greater.'\
' The status of the replication cannot be determined reliably '\
'with the current version.'.color(:red)
puts
end
end
def print_repositories_status def print_repositories_status
print 'Repositories: '.rjust(GEO_STATUS_COLUMN_WIDTH) print 'Repositories: '.rjust(GEO_STATUS_COLUMN_WIDTH)
......
...@@ -65,22 +65,6 @@ RSpec.describe Admin::Geo::NodesController do ...@@ -65,22 +65,6 @@ RSpec.describe Admin::Geo::NodesController do
expect(response).not_to redirect_to(:forbidden) expect(response).not_to redirect_to(:forbidden)
end end
end end
context 'with Postgres 9.6 or greater' do
before do
allow(Gitlab::Database).to receive(:postgresql_minimum_supported_version?).and_return(true)
end
it_behaves_like 'no flash message', :warning
end
context 'without Postgres 9.6 or greater' do
before do
allow(Gitlab::Database).to receive(:postgresql_minimum_supported_version?).and_return(false)
end
it_behaves_like 'with flash message', :warning, 'Please upgrade PostgreSQL to version 9.6 or greater.'
end
end end
describe '#create' do describe '#create' do
......
...@@ -16881,9 +16881,6 @@ msgstr "" ...@@ -16881,9 +16881,6 @@ msgstr ""
msgid "Please type %{phrase_code} to proceed or close this modal to cancel." msgid "Please type %{phrase_code} to proceed or close this modal to cancel."
msgstr "" msgstr ""
msgid "Please upgrade PostgreSQL to version 9.6 or greater. The status of the replication cannot be determined reliably with the current version."
msgstr ""
msgid "Please use this form to report to the admin users who create spam issues, comments or behave inappropriately." msgid "Please use this form to report to the admin users who create spam issues, comments or behave inappropriately."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment