Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-09 03:07:40 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-09 03:07:40 +0300
commite8793358645d6c84b46ef56dafcbf834f20d6415 (patch)
treec1c90c19c86b312a7def8dbdd2ddd8888b696d70 /doc/administration/pages
parente0b84f4ba4b44c8ecf00be97843c40df2550b74c (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/pages')
-rw-r--r--doc/administration/pages/index.md8
-rw-r--r--doc/administration/pages/source.md4
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index e876d71342e..1254d96f341 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -257,8 +257,8 @@ When adding a custom domain, users will be required to prove they own it by
adding a GitLab-controlled verification code to the DNS records for that domain.
If your userbase is private or otherwise trusted, you can disable the
-verification requirement. Navigate to `Admin area ➔ Settings` and uncheck
-**Require users to prove ownership of custom domains** in the Pages section.
+verification requirement. Navigate to **Admin Area > Settings > Preferences** and
+uncheck **Require users to prove ownership of custom domains** in the **Pages** section.
This setting is enabled by default.
### Let's Encrypt integration
@@ -395,8 +395,8 @@ Omnibus GitLab 11.1.
## Set maximum pages size
-You can configure the maximum size of the unpacked archive per project in the
-Admin area. Under Application settings, edit the **Maximum size of pages (MB)**.
+You can configure the maximum size of the unpacked archive per project in
+**Admin Area > Settings > Preferences > Pages**, in **Maximum size of pages (MB)**.
The default is 100MB.
### Override maximum pages size per project or group **(PREMIUM ONLY)**
diff --git a/doc/administration/pages/source.md b/doc/administration/pages/source.md
index be8bba3c95b..738eb87d53d 100644
--- a/doc/administration/pages/source.md
+++ b/doc/administration/pages/source.md
@@ -433,8 +433,8 @@ are stored.
## Set maximum Pages size
-The maximum size of the unpacked archive per project can be configured in the
-Admin area under the Application settings in the **Maximum size of pages (MB)**.
+The maximum size of the unpacked archive per project can be configured in
+**Admin Area > Settings > Preferences > Pages**, in **Maximum size of pages (MB)**.
The default is 100MB.
## Backup