Automatic merge of gitlab-org/gitlab-ce master

danger/only_documentation/Dangerfile

 # rubocop:disable Style/SignalException
 # frozen_string_literal: true
 
-has_only_docs_changes = helper.all_changed_files.all? { |file| file.start_with?('doc/', '.gitlab/ci/docs.gitlab-ci.yml') }
+has_only_docs_changes = helper.all_changed_files.all? { |file| file.start_with?('doc/', '.gitlab/ci/docs.gitlab-ci.yml', '.mdlrc') }
 is_docs_only_branch = gitlab.branch_for_head =~ /(^docs[\/-].*|.*-docs$)/
 
 if is_docs_only_branch && !has_only_docs_changes

doc/administration/high_availability/gitlab.md

@@ -125,7 +125,7 @@ need some extra configuration.
    from running on upgrade. Only the primary GitLab application server should
    handle migrations.
 
-1. **Optional** Configure host keys. Copy all contents(primary and public keys) inside `/etc/ssh/` on
+1. **Recommended** Configure host keys. Copy the contents (primary and public keys) of `/etc/ssh/` on
    the primary application server to `/etc/ssh` on all secondary servers. This
    prevents false man-in-the-middle-attack alerts when accessing servers in your
    High Availability cluster behind a load balancer.

scripts/trigger-build-docs

@@ -105,8 +105,8 @@ def trigger_pipeline
   puts ""
   puts app_url
   puts ""
-  puts "=> For more information, read the documentation"
-  puts "=> https://docs.gitlab.com/ee/development/writing_documentation.html#previewing-the-changes-live"
+  puts "=> For more information, see the documentation"
+  puts "=> https://docs.gitlab.com/ee/development/documentation/index.html#previewing-the-changes-live"
   puts ""
   puts "=> If something doesn't work, drop a line in the #docs chat channel."
   puts ""