diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-28 03:06:32 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-28 03:06:32 +0000 |
commit | 284ae7dd7536df63fc6dd971f65ca420e26d2f05 (patch) | |
tree | 356c0c422685367487d15a8634e978d1f5e8f4ca /doc/user/admin_area | |
parent | 2c0b1b6259d83e37c2a2b456a1f9afdb8817a3d5 (diff) | |
download | gitlab-ce-284ae7dd7536df63fc6dd971f65ca420e26d2f05.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/admin_area')
-rw-r--r-- | doc/user/admin_area/appearance.md | 8 | ||||
-rw-r--r-- | doc/user/admin_area/monitoring/health_check.md | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/user/admin_area/appearance.md b/doc/user/admin_area/appearance.md index 1fea6ab8b02..b9eb9e2a731 100644 --- a/doc/user/admin_area/appearance.md +++ b/doc/user/admin_area/appearance.md @@ -46,8 +46,8 @@ of your GitLab instance. These messages will appear on all projects and pages of instance, including the sign in / sign up page. The default color is white text on an orange background, but this can be customized by clicking on **Customize colors**. -Limited [markdown](../markdown.md) is supported, such as bold, italics, and links, for -example. Other markdown features, including lists, images and quotes, are not supported, +Limited [Markdown](../markdown.md) is supported, such as bold, italics, and links, for +example. Other Markdown features, including lists, images and quotes, are not supported, as the header and footer messages can only be a single line. ![header and footer screenshot](img/appearance_header_footer_v12_3.png) @@ -61,7 +61,7 @@ to activate it in the GitLab instance. ## Sign in / Sign up pages You can replace the default message on the sign in / sign up page with your own message -and logo. You can make full use of [markdown](../markdown.md) in the description: +and logo. You can make full use of [Markdown](../markdown.md) in the description: ![sign in message screenshot](img/appearance_sign_in_v12_3.png) @@ -81,7 +81,7 @@ You can add also add a [customized help message](settings/help_page.md) below th ## New project pages You can add a new project guidelines message to the **New project page** within GitLab. -You can make full use of [markdown](../markdown.md) in the description: +You can make full use of [Markdown](../markdown.md) in the description: ![new project message screenshot](img/appearance_new_project_v12_3.png) diff --git a/doc/user/admin_area/monitoring/health_check.md b/doc/user/admin_area/monitoring/health_check.md index 103d7ecc573..68767efc72a 100644 --- a/doc/user/admin_area/monitoring/health_check.md +++ b/doc/user/admin_area/monitoring/health_check.md @@ -103,7 +103,7 @@ This check is being exempt from Rack Attack. ## Liveness DANGER: **Warning:** -In Gitlab [12.4](https://about.gitlab.com/upcoming-releases/) +In GitLab [12.4](https://about.gitlab.com/upcoming-releases/) the response body of the Liveness check was changed to match the example below. |