Automatic merge of gitlab-org/gitlab-ce master

danger/changelog/Dangerfile

+# frozen_string_literal: true
 # rubocop:disable Style/SignalException
 
 require 'yaml'
 
-NO_CHANGELOG_LABELS = %w[backstage ci-build Documentation meta QA test].freeze
-SEE_DOC = "See [the documentation](https://docs.gitlab.com/ce/development/changelog.html).".freeze
-CREATE_CHANGELOG_MESSAGE = <<~MSG.freeze
+NO_CHANGELOG_LABELS = %w[backstage ci-build meta].freeze
+SEE_DOC = "See [the documentation](https://docs.gitlab.com/ce/development/changelog.html)."
+CREATE_CHANGELOG_MESSAGE = <<~MSG
 You can create one with:
 
 ```
 bin/changelog -m %<mr_iid>s "%<mr_title>s"
 ```
 
-If your merge request doesn't warrant a CHANGELOG entry,
-consider adding any of the %<labels>s labels.
-#{SEE_DOC}
+Note: Merge requests with %<labels>s do not trigger this check.
 MSG
 
 def ee_changelog?(changelog_path)
@@ -60,7 +59,7 @@ if changelog_needed
   if changelog_found
     check_changelog(changelog_found)
   else
-    warn "**[CHANGELOG missing](https://docs.gitlab.com/ce/development/changelog.html).**\n\n" +
+    message "**[CHANGELOG missing](https://docs.gitlab.com/ce/development/changelog.html)**: If this merge request [doesn't need a CHANGELOG entry](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry), feel free to ignore this message.\n\n" +
       format(CREATE_CHANGELOG_MESSAGE, mr_iid: gitlab.mr_json["iid"], mr_title: mr_title, labels: presented_no_changelog_labels)
   end
 end

doc/administration/gitaly/index.md

@@ -655,3 +655,33 @@ To fix this problem, confirm that your [`gitlab-secrets.json` file](#3-gitaly-se
 on the Gitaly node matches the one on all other nodes. If it doesn't match,
 update the secrets file on the Gitaly node to match the others, then
 [reconfigure the node](../restart_gitlab.md#omnibus-gitlab-reconfigure).
+
+### Command line tools cannot connect to Gitaly
+
+If you are having trouble connecting to a Gitaly node with command line (CLI) tools, and certain actions result in a `14: Connect Failed` error message, it means that gRPC cannot reach your Gitaly node.
+
+Verify that you can reach Gitaly via TCP:
+
+```bash
+sudo gitlab-rake gitlab:tcp_check[GITALY_SERVER_IP,GITALY_LISTEN_PORT]
+```
+
+If the TCP connection fails, check your network settings and your firewall rules. If the TCP connection succeeds, your networking and firewall rules are correct.
+
+If you use proxy servers in your command line environment, such as Bash, these can interfere with your gRPC traffic.
+
+If you use Bash or a compatible command line environment, run the following commands to determine whether you have proxy servers configured:
+
+```bash
+echo $http_proxy
+echo $https_proxy
+```
+
+If either of these variables have a value, your Gitaly CLI connections may be getting routed through a proxy which cannot connect to Gitaly.
+
+To remove the proxy setting, run the following commands (depending on which variables had values):
+
+```bash
+unset http_proxy
+unset https_proxy
+```
\ No newline at end of file

doc/user/admin_area/abuse_reports.md

@@ -2,7 +2,7 @@
 type: reference, howto
 ---
 
-# Abuse reports
+# Abuse reports **(CORE ONLY)**
 
 View and resolve abuse reports from GitLab users.
 

doc/user/admin_area/broadcast_messages.md

@@ -2,7 +2,7 @@
 type: reference, howto
 ---
 
-# Broadcast Messages
+# Broadcast Messages **(CORE ONLY)**
 
 GitLab can display messages to all users of a GitLab instance in a banner that appears in the UI.
 

doc/user/admin_area/diff_limits.md

@@ -2,7 +2,7 @@
 type: reference
 ---
 
-# Diff limits administration
+# Diff limits administration **(CORE ONLY)**
 
 You can set a maximum size for display of diff files (patches).
 

doc/user/admin_area/monitoring/health_check.md

@@ -2,7 +2,7 @@
 type: concepts, howto
 ---
 
-# Health Check
+# Health Check **(CORE ONLY)**
 
 > - Liveness and readiness probes were [introduced][ce-10416] in GitLab 9.1.
 > - The `health_check` endpoint was [introduced][ce-3888] in GitLab 8.8 and was

doc/user/admin_area/settings/account_and_limit_settings.md

@@ -2,7 +2,7 @@
 type: reference
 ---
 
-# Account and limit settings
+# Account and limit settings **(CORE ONLY)**
 
 ## Max attachment size
 

doc/user/admin_area/settings/email.md

@@ -2,7 +2,7 @@
 type: reference
 ---
 
-# Email
+# Email **(CORE ONLY)**
 
 You can customize some of the content in emails sent from your GitLab instance.
 

doc/user/admin_area/settings/sign_up_restrictions.md

@@ -2,7 +2,7 @@
 type: reference
 ---
 
-# Sign-up restrictions
+# Sign-up restrictions **(CORE ONLY)**
 
 You can use sign-up restrictions to require user email confirmation, as well as
 to blacklist or whitelist email addresses belonging to specific domains.

doc/user/admin_area/settings/terms.md

@@ -2,7 +2,7 @@
 type: reference
 ---
 
-# Enforce accepting Terms of Service
+# Enforce accepting Terms of Service **(CORE ONLY)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18570)
 > in [GitLab Core](https://about.gitlab.com/pricing/) 10.8

doc/user/admin_area/settings/third_party_offers.md

@@ -2,7 +2,7 @@
 type: reference
 ---
 
-# Third party offers
+# Third party offers **(CORE ONLY)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20379)
 > in [GitLab Core](https://about.gitlab.com/pricing/) 11.1

doc/user/admin_area/settings/usage_statistics.md

@@ -2,7 +2,7 @@
 type: reference
 ---
 
-# Usage statistics
+# Usage statistics **(CORE ONLY)**
 
 GitLab Inc. will periodically collect information about your instance in order
 to perform various actions.

doc/user/admin_area/settings/user_and_ip_rate_limits.md

@@ -2,7 +2,7 @@
 type: reference
 ---
 
-# User and IP rate limits
+# User and IP rate limits **(CORE ONLY)**
 
 Rate limiting is a common technique used to improve the security and durability
 of a web application. For more details, see

doc/user/admin_area/settings/visibility_and_access_controls.md

@@ -2,7 +2,7 @@
 type: reference
 ---
 
-# Visibility and access controls
+# Visibility and access controls **(CORE ONLY)**
 
 GitLab allows administrators to: