diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 00:09:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 00:09:29 +0000 |
| commit | b060b8b7e4e895e28226b366b92081512225cd14 (patch) | |
| tree | 0364ce1045b2e0a1cc3cad7b0d487e254335b66c /doc/user | |
| parent | 49a923c646a2c24b5377cfde8236c73094c60d42 (diff) | |
| download | gitlab-ce-b060b8b7e4e895e28226b366b92081512225cd14.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/admin_area/index.md | 15 | ||||
| -rw-r--r-- | doc/user/project/clusters/serverless/index.md | 4 |
2 files changed, 16 insertions, 3 deletions
diff --git a/doc/user/admin_area/index.md b/doc/user/admin_area/index.md index 6ec09c071ca..cbc033fdedc 100644 --- a/doc/user/admin_area/index.md +++ b/doc/user/admin_area/index.md @@ -51,7 +51,7 @@ The Dashboard is the default view of the Admin Area, and is made up of the follo | Section | Description | |:-----------|:---------------------------------------------------------------------------------------------------------------------------------------------------------| | Projects | The total number of projects, up to 10 of the latest projects, and the option of creating a new project. | -| Users | The total number of users, up to 10 of the latest users, and the option of creating a new user. | +| Users | The total number of users, up to 10 of the latest users, the option of creating a new user, and a link to [**Users statistics**](#users-statistics). | | Groups | The total number of groups, up to 10 of the latest groups, and the option of creating a new group. | | Statistics | Totals of all elements of the GitLab instance. | | Features | All features available on the GitLab instance. Enabled features are marked with a green circle icon, and disabled features are marked with a power icon. | @@ -134,6 +134,19 @@ To search for users, enter your criteria in the search field. The user search is insensitive, and applies partial matching to name and username. To search for an email address, you must provide the complete email address. +#### Users statistics + +The **Users statistics** page provides an overview of user accounts by role. Use this information +when validating seat usage of your subscription. + +The page displays subtotals of all users matching criteria such as _Users with highest role +Maintainer_ and _Blocked users_. + +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). + ### Administering Groups You can administer all groups in the GitLab instance from the Admin Area's Groups page. diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md index 0b5ebf3c74c..efffdaab8e5 100644 --- a/doc/user/project/clusters/serverless/index.md +++ b/doc/user/project/clusters/serverless/index.md @@ -245,7 +245,7 @@ project): ```yaml include: - template: Serverless.gitlab-ci.yml + - template: Serverless.gitlab-ci.yml functions:build: extends: .serverless:build:functions @@ -462,7 +462,7 @@ Add the following `.gitlab-ci.yml` to the root of your repository ```yaml include: - template: Serverless.gitlab-ci.yml + - template: Serverless.gitlab-ci.yml build: extends: .serverless:build:image |