Commit f0805a8b authored by Suzanne Selhorn's avatar Suzanne Selhorn

Merge branch 'docs-kramdown-warnings-1' into 'master'

Fix square bracket use flagged by kramdown

See merge request gitlab-org/gitlab!35412
parents 8e1be747 bf8328b7
...@@ -190,7 +190,7 @@ control over how the Pages daemon runs and serves content in your environment. ...@@ -190,7 +190,7 @@ control over how the Pages daemon runs and serves content in your environment.
| Setting | Description | | Setting | Description |
| ------- | ----------- | | ------- | ----------- |
| `pages_external_url` | The URL where GitLab Pages is accessible, including protocol (HTTP / HTTPS). If `https://` is used, you must also set `gitlab_pages['ssl_certificate']` and `gitlab_pages['ssl_certificate_key']`. | `pages_external_url` | The URL where GitLab Pages is accessible, including protocol (HTTP / HTTPS). If `https://` is used, you must also set `gitlab_pages['ssl_certificate']` and `gitlab_pages['ssl_certificate_key']`.
| **gitlab_pages[]** | | | `gitlab_pages[]` | |
| `access_control` | Whether to enable [access control](index.md#access-control). | `access_control` | Whether to enable [access control](index.md#access-control).
| `api_secret_key` | Full path to file with secret key used to authenticate with the GitLab API. Auto-generated when left unset. | `api_secret_key` | Full path to file with secret key used to authenticate with the GitLab API. Auto-generated when left unset.
| `artifacts_server` | Enable viewing [artifacts](../job_artifacts.md) in GitLab Pages. | `artifacts_server` | Enable viewing [artifacts](../job_artifacts.md) in GitLab Pages.
...@@ -225,14 +225,14 @@ control over how the Pages daemon runs and serves content in your environment. ...@@ -225,14 +225,14 @@ control over how the Pages daemon runs and serves content in your environment.
| `tls_max_version` | Specifies the maximum SSL/TLS version ("ssl3", "tls1.0", "tls1.1" or "tls1.2"). | `tls_max_version` | Specifies the maximum SSL/TLS version ("ssl3", "tls1.0", "tls1.1" or "tls1.2").
| `tls_min_version` | Specifies the minimum SSL/TLS version ("ssl3", "tls1.0", "tls1.1" or "tls1.2"). | `tls_min_version` | Specifies the minimum SSL/TLS version ("ssl3", "tls1.0", "tls1.1" or "tls1.2").
| `use_http2` | Enable HTTP2 support. | `use_http2` | Enable HTTP2 support.
| **gitlab_pages['env'][]** | | | `gitlab_pages['env'][]` | |
| `http_proxy` | Configure GitLab Pages to use an HTTP Proxy to mediate traffic between Pages and GitLab. Sets an environment variable `http_proxy` when starting Pages daemon. | `http_proxy` | Configure GitLab Pages to use an HTTP Proxy to mediate traffic between Pages and GitLab. Sets an environment variable `http_proxy` when starting Pages daemon.
| **gitlab_rails[]** | | | `gitlab_rails[]` | |
| `pages_domain_verification_cron_worker` | Schedule for verifying custom GitLab Pages domains. | `pages_domain_verification_cron_worker` | Schedule for verifying custom GitLab Pages domains.
| `pages_domain_ssl_renewal_cron_worker` | Schedule for obtaining and renewing SSL certificates through Let's Encrypt for GitLab Pages domains. | `pages_domain_ssl_renewal_cron_worker` | Schedule for obtaining and renewing SSL certificates through Let's Encrypt for GitLab Pages domains.
| `pages_domain_removal_cron_worker` | Schedule for removing unverified custom GitLab Pages domains. | `pages_domain_removal_cron_worker` | Schedule for removing unverified custom GitLab Pages domains.
| `pages_path` | The directory on disk where pages are stored, defaults to `GITLAB-RAILS/shared/pages`. | `pages_path` | The directory on disk where pages are stored, defaults to `GITLAB-RAILS/shared/pages`.
| **pages_nginx[]** | | | `pages_nginx[]` | |
| `enable` | Include a virtual host `server{}` block for Pages inside NGINX. Needed for NGINX to proxy traffic back to the Pages daemon. Set to `false` if the Pages daemon should directly receive all requests, for example, when using [custom domains](index.md#custom-domains). | `enable` | Include a virtual host `server{}` block for Pages inside NGINX. Needed for NGINX to proxy traffic back to the Pages daemon. Set to `false` if the Pages daemon should directly receive all requests, for example, when using [custom domains](index.md#custom-domains).
--- ---
......
...@@ -533,8 +533,8 @@ via the GraphQL API! ...@@ -533,8 +533,8 @@ via the GraphQL API!
1. Take care of replicating "update" events. Geo Framework does not currently support 1. Take care of replicating "update" events. Geo Framework does not currently support
replicating "update" events because all entities added to the framework, by this time, replicating "update" events because all entities added to the framework, by this time,
are immutable. If this is the case are immutable. If this is the case
for the entity you're going to add, please follow [https://gitlab.com/gitlab-org/gitlab/-/issues/118743] for the entity you're going to add, please follow <https://gitlab.com/gitlab-org/gitlab/-/issues/118743>
and [https://gitlab.com/gitlab-org/gitlab/-/issues/118745] as examples to add the new event type. and <https://gitlab.com/gitlab-org/gitlab/-/issues/118745> as examples to add the new event type.
Please also remove this notice when you've added it. Please also remove this notice when you've added it.
#### Admin UI #### Admin UI
......
...@@ -363,10 +363,12 @@ service account for your project. For help debugging this issue, see ...@@ -363,10 +363,12 @@ service account for your project. For help debugging this issue, see
After upgrading to GitLab 13.0, you may encounter this message when deploying After upgrading to GitLab 13.0, you may encounter this message when deploying
with Auto DevOps: with Auto DevOps:
> Detected an existing PostgreSQL database installed on the ```plaintext
Detected an existing PostgreSQL database installed on the
deprecated channel 1, but the current channel is set to 2. The default deprecated channel 1, but the current channel is set to 2. The default
channel changed to 2 in of GitLab 13.0. channel changed to 2 in of GitLab 13.0.
> [...] [...]
```
Auto DevOps, by default, installs an in-cluster PostgreSQL database alongside Auto DevOps, by default, installs an in-cluster PostgreSQL database alongside
your application. The default installation method changed in GitLab 13.0, and your application. The default installation method changed in GitLab 13.0, and
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment