Commit ebf56669 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'patch-188' into 'master'

Use correct alert box formatting

See merge request gitlab-org/gitlab!36698
parents 842f1257 44fa4606
...@@ -208,7 +208,7 @@ attribute. As a prerequisite, you must use an LDAP server that: ...@@ -208,7 +208,7 @@ attribute. As a prerequisite, you must use an LDAP server that:
client_certificate_required_port: 3443 client_certificate_required_port: 3443
``` ```
NOTE: **Note** NOTE: **Note:**
Assign a value to at least one of the following variables: Assign a value to at least one of the following variables:
`client_certificate_required_host` or `client_certificate_required_port`. `client_certificate_required_host` or `client_certificate_required_port`.
......
...@@ -274,7 +274,7 @@ secondary domain, like changing Git remotes and API URLs. ...@@ -274,7 +274,7 @@ secondary domain, like changing Git remotes and API URLs.
external_url 'https://<new_external_url>' external_url 'https://<new_external_url>'
``` ```
NOTE: **Note** NOTE: **Note:**
Changing `external_url` won't prevent access via the old secondary URL, as Changing `external_url` won't prevent access via the old secondary URL, as
long as the secondary DNS records are still intact. long as the secondary DNS records are still intact.
......
...@@ -18,7 +18,7 @@ Though these instructions use [AWS Route53](https://aws.amazon.com/route53/), ...@@ -18,7 +18,7 @@ Though these instructions use [AWS Route53](https://aws.amazon.com/route53/),
other services such as [Cloudflare](https://www.cloudflare.com/) could be used other services such as [Cloudflare](https://www.cloudflare.com/) could be used
as well. as well.
NOTE: **Note** NOTE: **Note:**
You can also use a load balancer to distribute web UI or API traffic to You can also use a load balancer to distribute web UI or API traffic to
[multiple Geo **secondary** nodes](../../../user/admin_area/geo_nodes.md#multiple-secondary-nodes-behind-a-load-balancer). [multiple Geo **secondary** nodes](../../../user/admin_area/geo_nodes.md#multiple-secondary-nodes-behind-a-load-balancer).
Importantly, the **primary** node cannot yet be included. See the feature request Importantly, the **primary** node cannot yet be included. See the feature request
......
...@@ -966,7 +966,7 @@ Virtual storage: default ...@@ -966,7 +966,7 @@ Virtual storage: default
Currently `dataloss` only considers a repository up to date if it has been directly replicated to from the previous write-enabled primary. While reconciling from an up to date secondary can recover the data, this is not visible in the data loss report. This is due for improvement via [Gitaly#2866](https://gitlab.com/gitlab-org/gitaly/-/issues/2866). Currently `dataloss` only considers a repository up to date if it has been directly replicated to from the previous write-enabled primary. While reconciling from an up to date secondary can recover the data, this is not visible in the data loss report. This is due for improvement via [Gitaly#2866](https://gitlab.com/gitlab-org/gitaly/-/issues/2866).
NOTE: **NOTE** `dataloss` is still in beta and the output format is subject to change. NOTE: **Note:** `dataloss` is still in beta and the output format is subject to change.
### Checking repository checksums ### Checking repository checksums
......
...@@ -106,7 +106,7 @@ If you configure GitLab to store CI logs and artifacts on object storage, you mu ...@@ -106,7 +106,7 @@ If you configure GitLab to store CI logs and artifacts on object storage, you mu
#### Object Storage Settings #### Object Storage Settings
NOTE: **Note** In GitLab 13.2 and later, we recommend using the NOTE: **Note:** In GitLab 13.2 and later, we recommend using the
[consolidated object storage settings](object_storage.md#consolidated-object-storage-configuration). [consolidated object storage settings](object_storage.md#consolidated-object-storage-configuration).
This section describes the earlier configuration format. This section describes the earlier configuration format.
......
...@@ -63,7 +63,7 @@ GitLab provides two different options for the uploading mechanism: "Direct uploa ...@@ -63,7 +63,7 @@ GitLab provides two different options for the uploading mechanism: "Direct uploa
[Read more about using object storage with GitLab](../object_storage.md). [Read more about using object storage with GitLab](../object_storage.md).
NOTE: **Note** In GitLab 13.2 and later, we recommend using the NOTE: **Note:** In GitLab 13.2 and later, we recommend using the
[consolidated object storage settings](../object_storage.md#consolidated-object-storage-configuration). [consolidated object storage settings](../object_storage.md#consolidated-object-storage-configuration).
This section describes the earlier configuration format. This section describes the earlier configuration format.
......
...@@ -72,7 +72,7 @@ be configured already. ...@@ -72,7 +72,7 @@ be configured already.
## Object Storage Settings ## Object Storage Settings
NOTE: **Note** In GitLab 13.2 and later, we recommend using the NOTE: **Note:** In GitLab 13.2 and later, we recommend using the
[consolidated object storage settings](object_storage.md#consolidated-object-storage-configuration). [consolidated object storage settings](object_storage.md#consolidated-object-storage-configuration).
This section describes the earlier configuration format. This section describes the earlier configuration format.
......
...@@ -253,7 +253,7 @@ gitlab_rails['object_store']['connection'] = { ...@@ -253,7 +253,7 @@ gitlab_rails['object_store']['connection'] = {
#### OpenStack-compatible connection settings #### OpenStack-compatible connection settings
NOTE: **Note** This is not compatible with the consolidated object storage form. NOTE: **Note:** This is not compatible with the consolidated object storage form.
OpenStack Swift is only supported with the storage-specific form. See the OpenStack Swift is only supported with the storage-specific form. See the
[S3 settings](#s3-compatible-connection-settings) if you want to use the consolidated form. [S3 settings](#s3-compatible-connection-settings) if you want to use the consolidated form.
...@@ -274,7 +274,7 @@ Here are the valid connection settings below for the Swift API, provided by ...@@ -274,7 +274,7 @@ Here are the valid connection settings below for the Swift API, provided by
#### Rackspace Cloud Files #### Rackspace Cloud Files
NOTE: **Note** This is not compatible with the consolidated object NOTE: **Note:** This is not compatible with the consolidated object
storage form. Rackspace Cloud is only supported with the storage-specific form. storage form. Rackspace Cloud is only supported with the storage-specific form.
Here are the valid connection parameters for Rackspace Cloud, provided by Here are the valid connection parameters for Rackspace Cloud, provided by
...@@ -408,7 +408,7 @@ additional complexity and unnecessary redundancy. Since both GitLab ...@@ -408,7 +408,7 @@ additional complexity and unnecessary redundancy. Since both GitLab
Rails and Workhorse components need access to object storage, the Rails and Workhorse components need access to object storage, the
consolidated form avoids excessive duplication of credentials. consolidated form avoids excessive duplication of credentials.
NOTE: **Note** The consolidated object storage configuration is **only** used if all NOTE: **Note:** The consolidated object storage configuration is **only** used if all
lines from the original form is omitted. To move to the consolidated form, remove the original configuration (for example, `artifacts_object_store_enabled`, `uploads_object_store_connection`, and so on.) lines from the original form is omitted. To move to the consolidated form, remove the original configuration (for example, `artifacts_object_store_enabled`, `uploads_object_store_connection`, and so on.)
## Storage-specific configuration ## Storage-specific configuration
......
...@@ -87,7 +87,7 @@ store the blobs of the dependency proxy. ...@@ -87,7 +87,7 @@ store the blobs of the dependency proxy.
[Read more about using object storage with GitLab](../object_storage.md). [Read more about using object storage with GitLab](../object_storage.md).
NOTE: **Note** In GitLab 13.2 and later, we recommend using the NOTE: **Note:** In GitLab 13.2 and later, we recommend using the
[consolidated object storage settings](../object_storage.md#consolidated-object-storage-configuration). [consolidated object storage settings](../object_storage.md#consolidated-object-storage-configuration).
This section describes the earlier configuration format. This section describes the earlier configuration format.
......
...@@ -99,7 +99,7 @@ store packages. ...@@ -99,7 +99,7 @@ store packages.
[Read more about using object storage with GitLab](../object_storage.md). [Read more about using object storage with GitLab](../object_storage.md).
NOTE: **Note** We recommend using the [consolidated object storage settings](../object_storage.md#consolidated-object-storage-configuration). The following instructions apply to the original config format. NOTE: **Note:** We recommend using the [consolidated object storage settings](../object_storage.md#consolidated-object-storage-configuration). The following instructions apply to the original config format.
**Omnibus GitLab installations** **Omnibus GitLab installations**
......
...@@ -170,7 +170,7 @@ You can filter the selection dropdown by writing part of the namespace or projec ...@@ -170,7 +170,7 @@ You can filter the selection dropdown by writing part of the namespace or projec
![limit namespace filter](img/limit_namespace_filter.png) ![limit namespace filter](img/limit_namespace_filter.png)
NOTE: **Note**: NOTE: **Note:**
If no namespaces or projects are selected, no Elasticsearch indexing will take place. If no namespaces or projects are selected, no Elasticsearch indexing will take place.
CAUTION: **Warning**: CAUTION: **Warning**:
......
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