Merge branch 'ce-to-ee' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee

app/models/geo/base_registry.rb

 class Geo::BaseRegistry < ActiveRecord::Base
   self.abstract_class = true
 
-  if Gitlab::Geo.secondary? || Rails.env.test?
+  if Gitlab::Geo.secondary? || (Rails.env.test? && Rails.configuration.respond_to?(:geo_database))
     establish_connection Rails.configuration.geo_database
   end
 end

spec/support/db_cleaner.rb

@@ -30,7 +30,10 @@ RSpec.configure do |config|
   end
 
   def setup_database_cleaner
-    DatabaseCleaner[:active_record, { connection: Geo::BaseRegistry }]
+    if Rails.configuration.respond_to?(:geo_database)
+      DatabaseCleaner[:active_record, { connection: Geo::BaseRegistry }]
+    end
+
     DatabaseCleaner[:active_record, { connection: ActiveRecord::Base }]
   end
 end