diff options
author | Evan Read <eread@gitlab.com> | 2019-09-10 09:24:34 +0000 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2019-09-10 09:24:34 +0000 |
commit | a66c7c2e3b95a4ef2aa1e33e63e1bbbf03954f07 (patch) | |
tree | acc72b00720c7f0538e9a5a8bb1f20ce809ab2b5 | |
parent | 4d542db508e454d4ed3a2cdb0a91aee67e1c5cd8 (diff) | |
parent | 34dcfa7456f96f913c74fb5ce069019830e94a4c (diff) | |
download | gitlab-ce-a66c7c2e3b95a4ef2aa1e33e63e1bbbf03954f07.tar.gz |
Merge branch 'docs-add-user-creation-blunceford' into 'master'
Add user creation documentation
Closes gitlab-com/support/support-team-meta#1681
See merge request gitlab-org/gitlab-ce!32411
-rw-r--r-- | doc/administration/index.md | 1 | ||||
-rw-r--r-- | doc/user/profile/account/create_accounts.md | 36 | ||||
-rw-r--r-- | doc/user/profile/account/img/admin_user_button.png | bin | 0 -> 84870 bytes | |||
-rw-r--r-- | doc/user/profile/account/img/admin_user_form.png | bin | 0 -> 196691 bytes | |||
-rw-r--r-- | doc/user/profile/account/img/register_tab.png | bin | 0 -> 205561 bytes | |||
-rw-r--r-- | doc/user/profile/index.md | 4 |
6 files changed, 41 insertions, 0 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md index d557068e6c8..b58291b7478 100644 --- a/doc/administration/index.md +++ b/doc/administration/index.md @@ -104,6 +104,7 @@ Learn how to install, configure, update, and maintain your GitLab instance. ## User settings and permissions +- [Creating users](../user/profile/account/create_accounts.md): Create users manually or through authentication integrations. - [Libravatar](../customization/libravatar.md): Use Libravatar instead of Gravatar for user avatars. - [Sign-up restrictions](../user/admin_area/settings/sign_up_restrictions.md): block email addresses of specific domains, or whitelist only specific domains. - [Access restrictions](../user/admin_area/settings/visibility_and_access_controls.md#enabled-git-access-protocols): Define which Git access protocols can be used to talk to GitLab (SSH, HTTP, HTTPS). diff --git a/doc/user/profile/account/create_accounts.md b/doc/user/profile/account/create_accounts.md new file mode 100644 index 00000000000..c0a887d0779 --- /dev/null +++ b/doc/user/profile/account/create_accounts.md @@ -0,0 +1,36 @@ +--- +type: reference +--- + +# Creating users **(CORE ONLY)** + +You can create users: + +- Manually through the sign in page or Admin Area. +- Automatically through user authentication integrations. + +## 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 using the **Register** tab on the sign in page. + +![Register Tab](img/register_tab.png) + +## Create users in admin area + +As an admin user, you can manually create users by: + +1. Navigating to **Admin Area > Overview > Users** (`/admin/users` page). +1. Selecting the **New User** button. + +You can also [create users through the API](../../../api/users.md) as an admin. + +![Admin User Button](img/admin_user_button.png) + +![Admin User Form](img/admin_user_form.png) + +## Create users through integrations + +Users will be: + +- Automatically created upon first login with the [LDAP integration](../../../administration/auth/ldap.md). +- Created when first logging in via an [OmniAuth provider](../../../integration/omniauth.md) if the `allow_single_sign_on` setting is present. diff --git a/doc/user/profile/account/img/admin_user_button.png b/doc/user/profile/account/img/admin_user_button.png Binary files differnew file mode 100644 index 00000000000..6be9c1e266a --- /dev/null +++ b/doc/user/profile/account/img/admin_user_button.png diff --git a/doc/user/profile/account/img/admin_user_form.png b/doc/user/profile/account/img/admin_user_form.png Binary files differnew file mode 100644 index 00000000000..ede96373c73 --- /dev/null +++ b/doc/user/profile/account/img/admin_user_form.png diff --git a/doc/user/profile/account/img/register_tab.png b/doc/user/profile/account/img/register_tab.png Binary files differnew file mode 100644 index 00000000000..73faa3edd1c --- /dev/null +++ b/doc/user/profile/account/img/register_tab.png diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md index e5ccc8ee758..40b7294c3bb 100644 --- a/doc/user/profile/index.md +++ b/doc/user/profile/index.md @@ -8,6 +8,10 @@ Each GitLab account has a user profile, and settings. Your [profile](#user-profi contains information about you, and your GitLab activity. Your [settings](#profile-settings) allow you to customize some aspects of GitLab to suit yourself. +## Creating users + +There are several ways to create users on GitLab. See the [creating users documentation](account/create_accounts.md) for more details. + ## Signing in There are several ways to sign into your GitLab account. |