Merge branch 'bw-fix-geo-eager-load' into 'master'

'sha_attribute' causes error when Geo is not enabled

See merge request gitlab-org/gitlab-ee!5276

app/models/concerns/sha_attribute.rb

@@ -2,9 +2,9 @@ module ShaAttribute
   extend ActiveSupport::Concern
 
   module ClassMethods
-    def sha_attribute(name)
+    def sha_attribute(name, database_available = true)
       return if ENV['STATIC_VERIFICATION']
-      return unless table_exists?
+      return unless database_available && table_exists?
 
       column = columns.find { |c| c.name == name.to_s }
 

ee/app/models/geo/project_registry.rb

@@ -10,8 +10,8 @@ class Geo::ProjectRegistry < Geo::BaseRegistry
   ignore_column :repository_verification_checksum
   ignore_column :wiki_verification_checksum
 
-  sha_attribute :repository_verification_checksum_sha
-  sha_attribute :wiki_verification_checksum_sha
+  sha_attribute :repository_verification_checksum_sha, ::Gitlab::Geo.geo_database_configured?
+  sha_attribute :wiki_verification_checksum_sha, ::Gitlab::Geo.geo_database_configured?
 
   belongs_to :project