Add latest changes from gitlab-org/gitlab@master

4 files changed, 29 insertions, 9 deletions

diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md
index 6f6c2e0068e..339710624fa 100644
--- a/doc/administration/auth/ldap.md
+++ b/doc/administration/auth/ldap.md
@@ -609,3 +609,16 @@ Could not authenticate you from Ldapmain because "Connection timed out - user sp
 If your configured LDAP provider and/or endpoint is offline or otherwise unreachable by GitLab, no LDAP user will be able to authenticate and log in. GitLab does not cache or store credentials for LDAP users to provide authentication during an LDAP outage.
 
 Contact your LDAP provider or administrator if you are seeing this error.
+
+### No file specified as Settingslogic source
+
+If `sudo gitlab-ctl reconfigure` fails with the following error, or you are seeing it in
+the logs, you may have malformed YAML in `/etc/gitlab/gitlab.rb`:
+
+```plaintext
+Errno::ENOENT: No such file or directory - No file specified as Settingslogic source
+```
+
+This issue is frequently due to the spacing in your YAML file. To fix the problem,
+verify the syntax with **spacing** against the
+[documentation for the configuration of LDAP](#configuration).
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index 5ed0965115e..6165bfe24f7 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -83,7 +83,7 @@ GitLab Pages expect to run on their own virtual host. In your DNS server/provide
 you need to add a [wildcard DNS A record][wiki-wildcard-dns] pointing to the
 host that GitLab runs. For example, an entry would look like this:
 
-```
+```plaintext
 *.example.io. 1800 IN A    192.0.2.1
 *.example.io. 1800 IN AAAA 2001::1
 ```
diff --git a/doc/administration/pages/source.md b/doc/administration/pages/source.md
index 1f38a71efe1..04c8a478f50 100644
--- a/doc/administration/pages/source.md
+++ b/doc/administration/pages/source.md
@@ -64,7 +64,7 @@ GitLab Pages expect to run on their own virtual host. In your DNS server/provide
 you need to add a [wildcard DNS A record][wiki-wildcard-dns] pointing to the
 host that GitLab runs. For example, an entry would look like this:
 
-```
+```plaintext
 *.example.io. 1800 IN A 192.0.2.1
 ```
 
@@ -131,7 +131,7 @@ The Pages daemon doesn't listen to the outside world.
    order to enable the pages daemon. In `gitlab_pages_options` the
    `-pages-domain` must match the `host` setting that you set above.
 
-   ```
+   ```ini
    gitlab_pages_enabled=true
    gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090"
    ```
@@ -170,7 +170,7 @@ outside world.
 
 1. In `gitlab.yml`, set the port to `443` and https to `true`:
 
-   ```shell
+   ```yaml
    ## GitLab Pages
    pages:
      enabled: true
@@ -188,9 +188,9 @@ outside world.
    The `-root-cert` and `-root-key` settings are the wildcard TLS certificates
    of the `example.io` domain:
 
-   ```
+   ```ini
    gitlab_pages_enabled=true
-   gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -root-cert /path/to/example.io.crt -root-key /path/to/example.io.key
+   gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -root-cert /path/to/example.io.crt -root-key /path/to/example.io.key"
    ```
 
 1. Copy the `gitlab-pages-ssl` NGINX configuration file:
@@ -256,7 +256,7 @@ world. Custom domains are supported, but no TLS.
    `-pages-domain` and `-listen-http` must match the `host` and `external_http`
    settings that you set above respectively:
 
-   ```
+   ```ini
    gitlab_pages_enabled=true
    gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -listen-http 192.0.2.2:80"
    ```
@@ -325,9 +325,9 @@ world. Custom domains and TLS are supported.
    The `-root-cert` and `-root-key` settings are the wildcard TLS certificates
    of the `example.io` domain:
 
-   ```
+   ```ini
    gitlab_pages_enabled=true
-   gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -listen-http 192.0.2.2:80 -listen-https 192.0.2.2:443 -root-cert /path/to/example.io.crt -root-key /path/to/example.io.key
+   gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -listen-http 192.0.2.2:80 -listen-https 192.0.2.2:443 -root-cert /path/to/example.io.crt -root-key /path/to/example.io.key"
    ```
 
 1. Copy the `gitlab-pages-ssl` NGINX configuration file:
diff --git a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md
index 4a7d677723a..48d415c6bdf 100644
--- a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md
+++ b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md
@@ -199,6 +199,13 @@ and they will assist you with any issues you are having.
     helm upgrade <release name> <chart path> -f gitlab.yaml
     ```
 
+- How to get the manifest for a release. It can be useful because it contains the info about
+all Kubernetes resources and dependent charts:
+
+    ```shell
+    helm get manifest <release name>
+    ```
+
 ## Installation of minimal GitLab config via Minukube on macOS
 
 This section is based on [Developing for Kubernetes with Minikube](https://docs.gitlab.com/charts/development/minikube/index.html)