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>2021-06-15 21:09:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-15 21:09:57 +0300
commita8476fe0cd764ac054763032b7cf6e63b0b493c5 (patch)
treeba2685026667de0b5d67c75bf98bb87014f01b32 /doc/user/profile/account
parent68d7192881c41305da9c6aa1e3f7dd8b47f286a7 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/profile/account')
-rw-r--r--doc/user/profile/account/create_accounts.md23
-rw-r--r--doc/user/profile/account/delete_account.md5
2 files changed, 18 insertions, 10 deletions
diff --git a/doc/user/profile/account/create_accounts.md b/doc/user/profile/account/create_accounts.md
index 91688989e55..972414dbf0b 100644
--- a/doc/user/profile/account/create_accounts.md
+++ b/doc/user/profile/account/create_accounts.md
@@ -14,16 +14,21 @@ You can create users:
## Create users on sign in page
-If you have [sign-up enabled](../../admin_area/settings/sign_up_restrictions.md), users can create their own accounts by selecting "Register now" on the sign-in page, or navigate to `https://gitlab.example.com/users/sign_up`.
+If you have [sign-up enabled](../../admin_area/settings/sign_up_restrictions.md), users can create
+their own accounts by either:
+
+- Selecting the **Register now** link on the sign-in page.
+- Navigating to `https://gitlab.example.com/users/sign_up`.
![Register Tab](img/register_v13_6.png)
## Create users in Admin Area
-As an admin user, you can manually create users by:
+As an Admin user, you can manually create users:
-1. Navigating to **Admin Area > Overview > Users** (`/admin/users` page).
-1. Selecting the **New User** button.
+1. On the top bar, select **Menu >** **{admin}** **Admin**.
+1. On the left sidebar, select **Overview > Users** (`/admin/users`).
+1. Select **New user**.
You can also [create users through the API](../../../api/users.md) as an admin.
@@ -33,9 +38,11 @@ You can also [create users through the API](../../../api/users.md) as an admin.
## Create users through authentication integrations
-Users will be:
+Users are:
- Automatically created upon first sign in with the [LDAP integration](../../../administration/auth/ldap/index.md).
-- Created when first signing in via an [OmniAuth provider](../../../integration/omniauth.md) if the `allow_single_sign_on` setting is present.
-- Created when first signing with [Group SAML](../../group/saml_sso/index.md)
-- Automatically created by [SCIM](../../group/saml_sso/scim_setup.md) when the user is created in the identity provider.
+- Created when first signing in using an [OmniAuth provider](../../../integration/omniauth.md) if
+ the `allow_single_sign_on` setting is present.
+- Created when first signing with [Group SAML](../../group/saml_sso/index.md).
+- Automatically created by [SCIM](../../group/saml_sso/scim_setup.md) when the user is created in
+ the identity provider.
diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md
index 361353a0f8c..c4ab54736bc 100644
--- a/doc/user/profile/account/delete_account.md
+++ b/doc/user/profile/account/delete_account.md
@@ -13,7 +13,7 @@ Users can be deleted from a GitLab instance, either by:
- An administrator.
NOTE:
-Deleting a user will delete all projects in that user namespace.
+Deleting a user deletes all projects in that user namespace.
## As a user
@@ -28,7 +28,8 @@ As a user, to delete your own account:
As an administrator, to delete a user account:
-1. Go to **Admin Area > Overview > Users**.
+1. On the top bar, select **Menu >** **{admin}** **Admin**.
+1. On the left sidebar, select **Overview > Users**.
1. Select a user.
1. Under the **Account** tab, select:
- **Delete user** to delete only the user but maintain their