diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-01 21:08:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-01 21:08:46 +0000 |
| commit | d15b856c1c42d198ba102123f72b8a0b19d143df (patch) | |
| tree | 6bfdaaa818d160b9e4f756ca09c0be397f963db9 /doc/user | |
| parent | 3011f8b297a5b71cd505a672b59cc8d3e0aa9f65 (diff) | |
| download | gitlab-ce-d15b856c1c42d198ba102123f72b8a0b19d143df.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/admin_area/settings/usage_statistics.md | 4 | ||||
| -rw-r--r-- | doc/user/project/pages/index.md | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/user/admin_area/settings/usage_statistics.md b/doc/user/admin_area/settings/usage_statistics.md index 12b9a9ff173..0580dc5f452 100644 --- a/doc/user/admin_area/settings/usage_statistics.md +++ b/doc/user/admin_area/settings/usage_statistics.md @@ -50,6 +50,10 @@ tier. Users can continue to access the features in a paid tier without sharing u - [Repository size limit](../settings/account_and_limit_settings.md#repository-size-limit). - [Group access restriction by IP address](../../group/access_and_permissions.md#restrict-group-access-by-ip-address). +### Features available in 16.0 and later + +- [Maintenance mode](../../../administration/maintenance_mode/index.md). + NOTE: Registration is not yet required for participation, but may be added in a future milestone. diff --git a/doc/user/project/pages/index.md b/doc/user/project/pages/index.md index f3b94bbf666..a68ad604989 100644 --- a/doc/user/project/pages/index.md +++ b/doc/user/project/pages/index.md @@ -126,6 +126,13 @@ If you are running a self-managed instance of GitLab, <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> Watch a [video tutorial](https://www.youtube.com/watch?v=dD8c7WNcc6s) about how to get started with GitLab Pages administration. +### Configure GitLab Pages in a Helm Chart (Kubernetes) instance + +To configure GitLab Pages on instances deployed via Helm chart (Kubernetes), use either: + +- [The `gitlab-pages` subchart](https://docs.gitlab.com/charts/charts/gitlab/gitlab-pages/). +- [An external GitLab Pages instance](https://docs.gitlab.com/charts/advanced/external-gitlab-pages/). + ## Security for GitLab Pages If your username is `example`, your GitLab Pages website is located at `example.gitlab.io`. |