Commit f4582d0f authored by Ash McKenzie's avatar Ash McKenzie

Merge branch...

Merge branch '13220-loading-geo-containerrepositoryregistry-requires-a-geo-secondary-database' into 'master'

Resolve "Loading `Geo::ContainerRepositoryRegistry` requires a Geo secondary database"

Closes #13220

See merge request gitlab-org/gitlab-ee!14967
parents 8f01dd9a d1b6179f
......@@ -13,6 +13,12 @@ module Geo
establish_connection Rails.configuration.geo_database
end
def self.connected?
super if ::Gitlab::Geo.geo_database_configured?
false
end
def self.connection
unless ::Gitlab::Geo.geo_database_configured?
message = NOT_CONFIGURED_MSG
......
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