Merge branch 'terms-of-service-ui-text' into 'master'

Terms of service settings UI text update

See merge request gitlab-org/gitlab!67002

app/views/admin/application_settings/_terms.html.haml

@@ -6,13 +6,13 @@
       .form-check
         = f.check_box :enforce_terms, class: 'form-check-input'
         = f.label :enforce_terms, class: 'form-check-label' do
-          = _("Require all users to accept Terms of Service and Privacy Policy when they access GitLab.")
+          = _("All users must accept the Terms of Service and Privacy Policy to access GitLab")
         .form-text.text-muted
-          = _("When enabled, users cannot use GitLab until the terms have been accepted.")
     .form-group
       = f.label :terms do
         = _("Terms of Service Agreement and Privacy Policy")
       = f.text_area :terms, class: 'form-control gl-form-input', rows: 8
       .form-text.text-muted
-        = _("Markdown enabled")
+        = _("Markdown supported.")
+        = link_to _('What is Markdown?'), help_page_path('user/markdown.md'), target: '_blank', rel: 'noopener noreferrer'
   = f.submit _("Save changes"), class: "gl-button btn btn-confirm"

app/views/admin/application_settings/general.html.haml

@@ -64,7 +64,8 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Include a Terms of Service agreement and Privacy Policy that all users must accept.')
+      = _('Add a Terms of Service agreement and Privacy Policy for users of this GitLab instance.')
+      = link_to _('Learn more.'), help_page_path('user/admin_area/settings/terms.md'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
     = render 'terms'
 

doc/user/admin_area/settings/terms.md

@@ -5,59 +5,35 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference
 ---
 
-# Enforce accepting Terms of Service **(FREE SELF)**
+# Terms of Service and Privacy Policy **(FREE SELF)**
 
-An administrator can enforce acceptance of a terms of service and privacy policy. When this option is enabled, new and existing users must accept the terms.
+An administrator can enforce acceptance of a terms of service and privacy policy.
+When this option is enabled, new and existing users must accept the terms.
 
-If configured, the Terms of Service page can be viewed via `https://your-instance.com/-/users/terms` at anytime.
+When enabled, you can view the Terms of Service at the `-/users/terms` page on the instance,
+for example `https://gitlab.example.com/-/users/terms`.
 
-## Configuration
+## Enforce a Terms of Service and Privacy Policy
 
 To enforce acceptance of a Terms of Service and Privacy Policy:
 
-1. Log in to the GitLab instance as an admin user.
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
 1. In the left sidebar, select **Settings > General**.
 1. Expand the **Terms of Service and Privacy Policy** section.
-1. Check the **Require all users to accept Terms of Service and Privacy Policy when they access
-   GitLab.** checkbox.
-1. Input the text of the **Terms of Service and Privacy Policy**. Markdown formatting can be used in this input box.
+1. Check the **All users must accept the Terms of Service and Privacy Policy to access GitLab** checkbox.
+1. Input the text of the **Terms of Service and Privacy Policy**. You can use [Markdown](../../markdown.md)
+   in this text box.
 1. Click **Save changes**.
-1. When you are presented with the **Terms of Service** statement, click **Accept terms**.
-
-![Enable enforcing Terms of Service](img/enforce_terms.png)
 
 For each update to the terms, a new version is stored. When a user accepts or declines the terms,
 GitLab records which version they accepted or declined.
 
-## New users
-
-When this feature is enabled, a checkbox is added to the sign-up form.
+When enabled, it adds a mandatory checkbox to the sign up page for new users:
 
 ![Sign up form](img/sign_up_terms.png)
 
-This checkbox is required during sign up.
-
-Users can review the terms entered in the admin panel before
-accepting. The page is opened in a new window so they can
-continue their registration afterwards.
-
-## Accepting terms
-
-When this feature is enabled, the users that have not accepted the
-terms of service are presented with a screen where they can either
-accept or decline the terms.
-
-![Respond to terms](img/respond_to_terms.png)
-
-If the user accepts the terms, they are directed to where they
-were going. After a sign-in or sign-up this is most likely the
-dashboard.
-
-If the user was already logged in when the feature was turned on,
-they are asked to accept the terms on their next interaction.
-
-If a user declines the terms, they are signed out.
+Existing users must accept the terms on their next GitLab interaction.
+If a logged-in user declines the terms, they are signed out.
 
 <!-- ## Troubleshooting
 

locale/gitlab.pot

@@ -1900,6 +1900,9 @@ msgstr ""
 msgid "Add a Jaeger URL to replace this page with a link to your Jaeger server. You first need to %{link_start_tag}install Jaeger%{link_end_tag}."
 msgstr ""
 
+msgid "Add a Terms of Service agreement and Privacy Policy for users of this GitLab instance."
+msgstr ""
+
 msgid "Add a bullet list"
 msgstr ""
 
@@ -3279,6 +3282,9 @@ msgstr ""
 msgid "All threads resolved"
 msgstr ""
 
+msgid "All users must accept the Terms of Service and Privacy Policy to access GitLab"
+msgstr ""
+
 msgid "All users must have a name."
 msgstr ""
 
@@ -17457,9 +17463,6 @@ msgstr ""
 msgid "Incident|There was an issue loading incident data. Please try again."
 msgstr ""
 
-msgid "Include a Terms of Service agreement and Privacy Policy that all users must accept."
-msgstr ""
-
 msgid "Include author name in notification email body"
 msgstr ""
 
@@ -20181,6 +20184,9 @@ msgstr ""
 msgid "Markdown is supported"
 msgstr ""
 
+msgid "Markdown supported."
+msgstr ""
+
 msgid "MarkdownEditor|Add a link (%{modifierKey}K)"
 msgstr ""
 
@@ -28053,9 +28059,6 @@ msgstr ""
 msgid "Require all users in this group to setup two-factor authentication"
 msgstr ""
 
-msgid "Require all users to accept Terms of Service and Privacy Policy when they access GitLab."
-msgstr ""
-
 msgid "Require all users to set up two-factor authentication"
 msgstr ""
 
@@ -37154,6 +37157,9 @@ msgstr ""
 msgid "What is Auto DevOps?"
 msgstr ""
 
+msgid "What is Markdown?"
+msgstr ""
+
 msgid "What is repository mirroring?"
 msgstr ""
 
@@ -37184,9 +37190,6 @@ msgstr ""
 msgid "When disabled, an external authentication provider must be used."
 msgstr ""
 
-msgid "When enabled, users cannot use GitLab until the terms have been accepted."
-msgstr ""
-
 msgid "When leaving the URL blank, classification labels can still be specified without disabling cross project features or performing external authorization checks."
 msgstr ""
 

spec/features/admin/admin_settings_spec.rb

@@ -190,7 +190,7 @@ RSpec.describe 'Admin updates settings' do
         accept_terms(admin)
 
         page.within('.as-terms') do
-          check 'Require all users to accept Terms of Service and Privacy Policy when they access GitLab.'
+          check 'All users must accept the Terms of Service and Privacy Policy to access GitLab'
           fill_in 'Terms of Service Agreement', with: 'Be nice!'
           click_button 'Save changes'
         end