diff options
author | Blair Lunceford <blunceford@gitlab.com> | 2019-09-09 19:22:14 +0000 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2019-09-10 19:13:12 +1000 |
commit | 473869a8f5e78fe7b5bfa778e78f8ea85fd9bd7b (patch) | |
tree | acc72b00720c7f0538e9a5a8bb1f20ce809ab2b5 | |
parent | 787ab5f71130cf052a3d59e5d5a293e224b8e4d0 (diff) | |
download | gitlab-ce-docs-add-user-creation-blunceford.tar.gz |
Moved doc path and added link in user account docdocs-add-user-creation-blunceford
-rw-r--r-- | doc/administration/index.md | 2 | ||||
-rw-r--r-- | doc/user/profile/account/create_accounts.md (renamed from doc/user/creating_users.md) | 8 | ||||
-rw-r--r-- | doc/user/profile/account/img/admin_user_button.png (renamed from doc/user/img/admin_user_button.png) | bin | 84870 -> 84870 bytes | |||
-rw-r--r-- | doc/user/profile/account/img/admin_user_form.png (renamed from doc/user/img/admin_user_form.png) | bin | 196691 -> 196691 bytes | |||
-rw-r--r-- | doc/user/profile/account/img/register_tab.png (renamed from doc/user/img/register_tab.png) | bin | 205561 -> 205561 bytes | |||
-rw-r--r-- | doc/user/profile/index.md | 4 |
6 files changed, 9 insertions, 5 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md index a9f5708f963..b58291b7478 100644 --- a/doc/administration/index.md +++ b/doc/administration/index.md @@ -104,7 +104,7 @@ Learn how to install, configure, update, and maintain your GitLab instance. ## User settings and permissions -- [Creating users](../user/creating_users.md): Create users manually or through authentication integrations. +- [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/creating_users.md b/doc/user/profile/account/create_accounts.md index a93f1039190..c0a887d0779 100644 --- a/doc/user/creating_users.md +++ b/doc/user/profile/account/create_accounts.md @@ -11,7 +11,7 @@ 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 using the **Register** tab on the 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) @@ -22,7 +22,7 @@ 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. +You can also [create users through the API](../../../api/users.md) as an admin. ![Admin User Button](img/admin_user_button.png) @@ -32,5 +32,5 @@ You can also [create users through the API](../api/users.md) as an admin. 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. +- 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/img/admin_user_button.png b/doc/user/profile/account/img/admin_user_button.png Binary files differindex 6be9c1e266a..6be9c1e266a 100644 --- a/doc/user/img/admin_user_button.png +++ b/doc/user/profile/account/img/admin_user_button.png diff --git a/doc/user/img/admin_user_form.png b/doc/user/profile/account/img/admin_user_form.png Binary files differindex ede96373c73..ede96373c73 100644 --- a/doc/user/img/admin_user_form.png +++ b/doc/user/profile/account/img/admin_user_form.png diff --git a/doc/user/img/register_tab.png b/doc/user/profile/account/img/register_tab.png Binary files differindex 73faa3edd1c..73faa3edd1c 100644 --- a/doc/user/img/register_tab.png +++ 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. |