diff options
author | Robert Speicher <robert@gitlab.com> | 2018-06-09 00:30:52 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 18:23:23 +0300 |
commit | 3774db741fdc26c6fdaa0d199db20ad5f090a410 (patch) | |
tree | 84a22a91ece360e54e74955de0a357f115891cfa /doc/user | |
parent | e5dfe3f46d56a91a8a956c7ba69efeb3d468821c (diff) |
Merge branch 'bvl-terms-on-registration' into 'master'
Users can accept terms during registration
Closes gitlab-ee#6262 and #47621
See merge request gitlab-org/gitlab-ce!19583
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/admin_area/settings/img/enforce_terms.png | bin | 51979 -> 54881 bytes | |||
-rw-r--r-- | doc/user/admin_area/settings/img/sign_up_terms.png | bin | 0 -> 18174 bytes | |||
-rw-r--r-- | doc/user/admin_area/settings/terms.md | 13 |
3 files changed, 13 insertions, 0 deletions
diff --git a/doc/user/admin_area/settings/img/enforce_terms.png b/doc/user/admin_area/settings/img/enforce_terms.png Binary files differindex e5f0a2683b5..3d93e1cc891 100644 --- a/doc/user/admin_area/settings/img/enforce_terms.png +++ b/doc/user/admin_area/settings/img/enforce_terms.png diff --git a/doc/user/admin_area/settings/img/sign_up_terms.png b/doc/user/admin_area/settings/img/sign_up_terms.png Binary files differnew file mode 100644 index 00000000000..4cac9d426c9 --- /dev/null +++ b/doc/user/admin_area/settings/img/sign_up_terms.png diff --git a/doc/user/admin_area/settings/terms.md b/doc/user/admin_area/settings/terms.md index 8e1fb982aba..aa817c9a209 100644 --- a/doc/user/admin_area/settings/terms.md +++ b/doc/user/admin_area/settings/terms.md @@ -20,6 +20,19 @@ When an admin enables this feature, they will automattically be directed to the page to accept the terms themselves. After they accept, they will be directed back to the settings page. +## New registrations + +When this feature is enabled, a checkbox will be available in the +sign-up form. + +![Sign up form](img/sign_up_terms.png) + +This checkbox will be required during sign up. + +Users can review the terms entered in the admin panel before +accepting. The page will be opened in a new window so they can +continue their registration afterwards. + ## Accepting terms When this feature was enabled, the users that have not accepted the |