Merge branch '4887-geo-improve-formatting-of-can-t-push-to-secondary-warning-message' into 'master'

Resolve "Geo: Improve formatting of can't push to secondary warning message"

Closes #4887

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

changelogs/unreleased-ee/4887-geo-improve-formatting-of-can-t-push-to-secondary-warning-message.yml

+---
+title: 'Geo: Improve formatting of can''t push to secondary warning message'
+merge_request:
+author:
+type: changed

ee/lib/ee/gitlab/geo_git_access.rb

@@ -18,7 +18,7 @@ module EE
         message = super
 
         if ::Gitlab::Geo.secondary_with_primary?
-          message += " Please use the Primary node URL: #{geo_primary_url_to_repo}. Documentation: #{GEO_SERVER_DOCS_URL}"
+          message += "\nPlease use the primary node URL instead: #{geo_primary_url_to_repo}.\nFor more information: #{GEO_SERVER_DOCS_URL}"
         end
 
         message

ee/spec/lib/gitlab/git_access_spec.rb

@@ -25,8 +25,9 @@ describe Gitlab::GitAccess do
     end
 
     it 'denies push access with primary present' do
-      error_message = "You can't push code to a read-only GitLab instance. "\
-"Please use the Primary node URL: https://localhost:3000/gitlab/#{project.full_path}.git. Documentation: #{EE::Gitlab::GeoGitAccess::GEO_SERVER_DOCS_URL}"
+      error_message = "You can't push code to a read-only GitLab instance."\
+"\nPlease use the primary node URL instead: https://localhost:3000/gitlab/#{project.full_path}.git.
+For more information: #{EE::Gitlab::GeoGitAccess::GEO_SERVER_DOCS_URL}"
 
       primary_node = create(:geo_node, :primary, url: 'https://localhost:3000/gitlab')
       allow(Gitlab::Geo).to receive(:primary).and_return(primary_node)

ee/spec/lib/gitlab/git_access_wiki_spec.rb

@@ -29,8 +29,10 @@ describe Gitlab::GitAccessWiki do
     end
 
     it 'denies push access with primary present' do
-      error_message = "You can't push code to a read-only GitLab instance. Please use the Primary node URL: "\
-"https://localhost:3000/gitlab/#{project.full_path}.wiki.git. Documentation: #{EE::Gitlab::GeoGitAccess::GEO_SERVER_DOCS_URL}"
+      error_message = "You can't push code to a read-only GitLab instance.
+Please use the primary node URL instead: "\
+"https://localhost:3000/gitlab/#{project.full_path}.wiki.git.
+For more information: #{EE::Gitlab::GeoGitAccess::GEO_SERVER_DOCS_URL}"
 
       primary_node = create(:geo_node, :primary, url: 'https://localhost:3000/gitlab')
       allow(Gitlab::Geo).to receive(:primary).and_return(primary_node)