From f5050253469fc0961c02deec0e698ad62bdd9de5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Apr 2020 09:09:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/admin_area/index.md | 3 +++ doc/user/admin_area/settings/index.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'doc/user/admin_area') diff --git a/doc/user/admin_area/index.md b/doc/user/admin_area/index.md index cbc033fdedc..204573da02d 100644 --- a/doc/user/admin_area/index.md +++ b/doc/user/admin_area/index.md @@ -147,6 +147,9 @@ The **Total users** is calculated as: **Active users** + **Blocked users**. GitLab billing is based on the number of active users. For details of active users, see [Choosing the number of users](../../subscriptions/index.md#choosing-the-number-of-users). +**Please note** that during the initial stage, the information won't be 100% accurate given that +background processes are still recollecting data. + ### Administering Groups You can administer all groups in the GitLab instance from the Admin Area's Groups page. diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md index 6731ebb1d8c..f0e7bf272a7 100644 --- a/doc/user/admin_area/settings/index.md +++ b/doc/user/admin_area/settings/index.md @@ -61,7 +61,7 @@ Access the default page for admin area settings by navigating to | ------ | ----------- | | [Continuous Integration and Deployment](continuous_integration.md) | Auto DevOps, runners and job artifacts. | | [Required pipeline configuration](continuous_integration.md#required-pipeline-configuration-premium-only) **(PREMIUM ONLY)** | Set an instance-wide auto included [pipeline configuration](../../../ci/yaml/README.md). This pipeline configuration will be run after the project's own configuration. | -| [Package Registry](continuous_integration.md#package-registry-configuration-premium-only) **(PREMIUM ONLY)**| Settings related to the use and experience of using GitLab's Package Registry. | +| [Package Registry](continuous_integration.md#package-registry-configuration-premium-only) **(PREMIUM ONLY)**| Settings related to the use and experience of using GitLab's Package Registry. Note there are [risks involved](./../../packages/container_registry/index.md#use-with-external-container-registries) in enabling some of these settings. | ## Reporting -- cgit v1.2.1