Merge branch 'sh-geo-node-replication-clarify' into 'master'

Geo: Clarify message about database replication not working

Closes #4924

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

ee/lib/gitlab/geo/health_check.rb

@@ -7,7 +7,7 @@ module Gitlab
         return '' unless Gitlab::Geo.secondary?
         return 'The Geo database configuration file is missing.' unless Gitlab::Geo.geo_database_configured?
         return 'The Geo node has a database that is not configured for streaming replication with the primary node.' unless self.database_secondary?
-        return 'The Geo node does not appear to be replicating data from the primary node.' if Gitlab::Database.pg_stat_wal_receiver_supported? && !self.streaming_active?
+        return 'The Geo node does not appear to be replicating the database from the primary node.' if Gitlab::Database.pg_stat_wal_receiver_supported? && !self.streaming_active?
 
         database_version  = self.get_database_version.to_i
         migration_version = self.get_migration_version.to_i

ee/spec/lib/gitlab/geo/health_check_spec.rb

@@ -72,7 +72,7 @@ describe Gitlab::Geo::HealthCheck, :geo do
       allow(described_class).to receive(:database_secondary?).and_return(true)
       allow(described_class).to receive(:streaming_active?).and_return(false)
 
-      expect(subject.perform_checks).to match(/The Geo node does not appear to be replicating data from the primary node/)
+      expect(subject.perform_checks).to match(/The Geo node does not appear to be replicating the database from the primary node/)
     end
 
     it 'returns an error when streaming is not active and Postgresql does not support pg_stat_wal_receiver' do