Merge branch '330157-msj-group-permission-lfs-2fa' into 'master'

Review Group-General/Permission, LFS, 2FA UI text

See merge request gitlab-org/gitlab!69869

app/helpers/groups_helper.rb

@@ -109,7 +109,7 @@ module GroupsHelper
   end
 
   def prevent_sharing_groups_outside_hierarchy_help_text(group)
-    s_("GroupSettings|This setting is only available on the top-level group and it applies to all subgroups. Groups that have already been shared with a group outside %{group} will still be shared, and this access will have to be revoked manually.").html_safe % { group: link_to_group(group) }
+    s_("GroupSettings|Available only on the top-level group. Applies to all subgroups. Groups already shared with a group outside %{group} are still shared unless removed manually.").html_safe % { group: link_to_group(group) }
   end
 
   def parent_group_options(current_group)
@@ -178,7 +178,7 @@ module GroupsHelper
   end
 
   def default_help
-    s_("GroupSettings|This setting is applied to all subgroups unless overridden by a group owner. Groups that have already been added to the project lose access.")
+    s_("GroupSettings|Applied to all subgroups unless overridden by a group owner. Groups already added to the project lose access.")
   end
 
   def ancestor_locked_but_you_can_override(group)

app/views/groups/_group_admin_settings.html.haml

@@ -36,4 +36,4 @@
   .offset-sm-2.col-sm-10
     .form-check
       = f.text_field :two_factor_grace_period, class: 'form-control'
-      .form-text.text-muted= _("Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication")
+      .form-text.text-muted= _("Time (in hours) that users are allowed to skip forced configuration of two-factor authentication.")

app/views/groups/edit.html.haml

@@ -23,7 +23,7 @@
     %button.btn.gl-button.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _('Advanced permissions, Large File Storage and Two-Factor authentication settings.')
+      = _('Configure advanced permissions, Large File Storage, and two-factor authentication settings.')
   .settings-content
     = render 'groups/settings/permissions'
 

app/views/groups/settings/_lfs.html.haml

@@ -3,10 +3,10 @@
 
 %h5= _('Large File Storage')
 
-%p= s_('Check the %{docs_link_start}documentation%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe }
+%p= s_('%{docs_link_start}What is Large File Storage?%{docs_link_end}').html_safe % { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe }
 
 .form-group.gl-mb-3
   = f.gitlab_ui_checkbox_component :lfs_enabled,
       _('Allow projects within this group to use Git LFS'),
-      help_text: _('This setting can be overridden in each project.'),
+      help_text: _('Can be overridden in each project.'),
       checkbox_options: { checked: @group.lfs_enabled?, data: { qa_selector: 'lfs_checkbox' } }

app/views/groups/settings/_permissions.html.haml

@@ -7,7 +7,7 @@
     - if @group.root?
       .form-group.gl-mb-3
         = f.gitlab_ui_checkbox_component :prevent_sharing_groups_outside_hierarchy,
-            s_('GroupSettings|Prevent members from sending invitations to groups outside of %{group} and its subgroups.').html_safe % { group: link_to_group(@group) },
+            s_('GroupSettings|Prevent members from sending invitations to groups outside of %{group} and its subgroups').html_safe % { group: link_to_group(@group) },
             help_text: prevent_sharing_groups_outside_hierarchy_help_text(@group),
             checkbox_options: { disabled: !can_change_prevent_sharing_groups_outside_hierarchy?(@group) }
 
@@ -21,13 +21,13 @@
       = f.gitlab_ui_checkbox_component :emails_disabled,
           s_('GroupSettings|Disable email notifications'),
           checkbox_options: { checked: @group.emails_disabled?, disabled: !can_disable_group_emails?(@group) },
-          help_text: s_('GroupSettings|This setting will override user notification preferences for all members of the group, subgroups, and projects.')
+          help_text: s_('GroupSettings|Overrides user notification preferences for all members of the group, subgroups, and projects.')
 
     .form-group.gl-mb-3
       = f.gitlab_ui_checkbox_component :mentions_disabled,
           s_('GroupSettings|Disable group mentions'),
           checkbox_options: { checked: @group.mentions_disabled? },
-          help_text: s_('GroupSettings|This setting will prevent group members from being notified if the group is mentioned.')
+          help_text: s_('GroupSettings|Prevents group members from being notified if the group is mentioned.')
 
     = render 'groups/settings/project_access_token_creation', f: f, group: @group
     = render_if_exists 'groups/settings/delayed_project_removal', f: f, group: @group

app/views/groups/settings/_two_factor_auth.html.haml

@@ -4,16 +4,16 @@
 
 %h5= _('Two-factor authentication')
 
-%p= s_('Check the %{docs_link_start}documentation%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe }
+%p= s_('%{docs_link_start}What is two-factor authentication?%{docs_link_end}').html_safe % { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe }
 
 .form-group
   = f.gitlab_ui_checkbox_component :require_two_factor_authentication,
-      _('Require all users in this group to setup two-factor authentication'),
+      _('Require all users in this group to set up two-factor authentication'),
       checkbox_options: { data: { qa_selector: 'require_2fa_checkbox' } }
 .form-group
   = f.label :two_factor_grace_period, _('Time before enforced'), class: 'label-bold'
   = f.text_field :two_factor_grace_period, class: 'form-control form-control-sm w-auto'
-  .form-text.text-muted= _('Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication')
+  .form-text.text-muted= _('Time (in hours) that users are allowed to skip forced configuration of two-factor authentication.')
 - unless group.has_parent?
   .form-group
     = f.gitlab_ui_checkbox_component :allow_mfa_for_subgroups,

doc/security/two_factor_authentication.md

@@ -50,7 +50,7 @@ To enforce 2FA only for certain groups:
 
 1. Go to the group's **Settings > General** page.
 1. Expand the **Permissions, LFS, 2FA** section.
-1. Select the **Require all users in this group to setup two-factor authentication** option.
+1. Select the **Require all users in this group to set up two-factor authentication** option.
 
 You can also specify a grace period in the **Time before enforced** option.
 

ee/app/assets/javascripts/pages/groups/edit/index.js

@@ -7,7 +7,7 @@ import { __ } from '~/locale';
 initAccessRestrictionField({
   selector: '.js-allowed-email-domains',
   props: {
-    placeholder: __('Enter domain'),
+    placeholder: __('example.com'),
     regexErrorMessage: __('The domain you entered is misformatted.'),
     disallowedValueErrorMessage: __('The domain you entered is not allowed.'),
   },
@@ -15,7 +15,7 @@ initAccessRestrictionField({
 
 initAccessRestrictionField({
   selector: '.js-ip-restriction',
-  props: { placeholder: __('Enter IP address range') },
+  props: { placeholder: __('192.168.0.0/24') },
   qaSelector: 'ip_restriction_field',
   customValidator: validateRestrictedIpAddress,
 });

ee/app/views/groups/settings/_allowed_email_domain.html.haml

@@ -11,9 +11,9 @@
     disallowed_values: AllowedEmailDomain::RESERVED_DOMAINS.to_json } }
   = f.hidden_field :allowed_email_domains_list, id: hidden_input_id
   .form-text.text-muted
-    - read_more_link = link_to(_('Read more'), help_page_path('user/group/index', anchor: 'restrict-group-access-by-domain'))
+    - learn_more_link = link_to(_('Learn more'), help_page_path('user/group/index', anchor: 'restrict-group-access-by-domain'))
     = _('Only verified users with an email address in any of these domains can be added to the group.')
     %br
     = _('Multiple domains are supported.')
     %br
-    = _('Some common domains are not allowed. %{read_more_link}.').html_safe % { read_more_link: read_more_link }
+    = _('Some common domains are not allowed. %{learn_more_link}.').html_safe % { learn_more_link: learn_more_link }

ee/app/views/groups/settings/_ip_restriction.html.haml

@@ -8,9 +8,8 @@
   .js-ip-restriction{ data: { hidden_input_id: hidden_input_id, label_id: label_id } }
   = f.hidden_field :ip_restriction_ranges, id: hidden_input_id
   .form-text.text-muted
-    - read_more_link = link_to(_('Read more'), help_page_path('user/group/index.md', anchor: 'restrict-group-access-by-ip-address'))
-    = _('This group, including all subgroups, projects and git repositories, will be reachable from only the specified IP address ranges.')
+    - learn_more_link = link_to(_('Learn more'), help_page_path('user/group/index.md', anchor: 'restrict-group-access-by-ip-address'))
+    = _('Only users from the specified IP address ranges are able to reach this group, including all subgroups, projects, and Git repositories.')
     %br
     = _('Multiple IP address ranges are supported.')
-    %br
-    = html_escape(_('Example: %{ip_address}. %{read_more_link}.')) % { read_more_link: read_more_link, ip_address: tag.code('192.168.0.0/24') }
+    = html_escape(_('%{learn_more_link}.')) % { learn_more_link: learn_more_link }

ee/app/views/groups/settings/_prevent_forking.html.haml

@@ -3,5 +3,4 @@
 .form-group.gl-mb-3
   = f.gitlab_ui_checkbox_component :prevent_forking_outside_group,
       s_('GroupSettings|Prevent forking outside of the group'),
-      checkbox_options: { disabled: !can_change_prevent_forking?(current_user, group), data: { qa_selector: 'prevent_forking_outside_group_checkbox' }, checked: group.prevent_forking_outside_group? },
-      help_text: s_('GroupSettings|This setting will prevent group members from forking projects outside of the group.')
+      checkbox_options: { disabled: !can_change_prevent_forking?(current_user, group), data: { qa_selector: 'prevent_forking_outside_group_checkbox' }, checked: group.prevent_forking_outside_group? }

ee/spec/features/groups/group_settings_spec.rb

@@ -367,7 +367,7 @@ RSpec.describe 'Edit group settings' do
   end
 
   describe 'email domain validation', :js do
-    let(:domain_field_selector) { '[placeholder="Enter domain"]' }
+    let(:domain_field_selector) { '[placeholder="example.com"]' }
 
     before do
       stub_licensed_features(group_allowed_email_domains: true)

locale/gitlab.pot

@@ -562,6 +562,12 @@ msgstr ""
 msgid "%{docs_link_start}Learn about visibility levels.%{docs_link_end}"
 msgstr ""
 
+msgid "%{docs_link_start}What is Large File Storage?%{docs_link_end}"
+msgstr ""
+
+msgid "%{docs_link_start}What is two-factor authentication?%{docs_link_end}"
+msgstr ""
+
 msgid "%{due_date} (Past due)"
 msgstr ""
 
@@ -691,6 +697,9 @@ msgstr ""
 msgid "%{label_for_message} unavailable"
 msgstr ""
 
+msgid "%{learn_more_link}."
+msgstr ""
+
 msgid "%{lessThan} 1 hour"
 msgstr ""
 
@@ -1334,6 +1343,9 @@ msgstr ""
 msgid "1000+"
 msgstr ""
 
+msgid "192.168.0.0/24"
+msgstr ""
+
 msgid "1st contribution!"
 msgstr ""
 
@@ -2906,9 +2918,6 @@ msgstr ""
 msgid "Advanced export options"
 msgstr ""
 
-msgid "Advanced permissions, Large File Storage and Two-Factor authentication settings."
-msgstr ""
-
 msgid "After a successful password update you will be redirected to login screen."
 msgstr ""
 
@@ -3482,9 +3491,6 @@ msgstr ""
 msgid "Amazon authentication is not %{link_start}correctly configured%{link_end}. Ask your GitLab administrator if you want to use this service."
 msgstr ""
 
-msgid "Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication"
-msgstr ""
-
 msgid "An %{link_start}alert%{link_end} with the same fingerprint is already open. To change the status of this alert, resolve the linked alert."
 msgstr ""
 
@@ -6138,6 +6144,9 @@ msgstr ""
 msgid "Can be manually deployed to"
 msgstr ""
 
+msgid "Can be overridden in each project."
+msgstr ""
+
 msgid "Can create groups:"
 msgstr ""
 
@@ -6531,9 +6540,6 @@ msgstr ""
 msgid "Check out, review, and merge locally"
 msgstr ""
 
-msgid "Check the %{docs_link_start}documentation%{docs_link_end}."
-msgstr ""
-
 msgid "Check the current instance configuration "
 msgstr ""
 
@@ -8601,6 +8607,9 @@ msgstr ""
 msgid "Configure a %{codeStart}.gitlab-webide.yml%{codeEnd} file in the %{codeStart}.gitlab%{codeEnd} directory to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}"
 msgstr ""
 
+msgid "Configure advanced permissions, Large File Storage, and two-factor authentication settings."
+msgstr ""
+
 msgid "Configure approvals by authors and committers on all projects."
 msgstr ""
 
@@ -12796,9 +12805,6 @@ msgstr ""
 msgid "Enter Admin Mode"
 msgstr ""
 
-msgid "Enter IP address range"
-msgstr ""
-
 msgid "Enter a number"
 msgstr ""
 
@@ -12811,9 +12817,6 @@ msgstr ""
 msgid "Enter at least three characters to search"
 msgstr ""
 
-msgid "Enter domain"
-msgstr ""
-
 msgid "Enter in your Bitbucket Server URL and personal access token below"
 msgstr ""
 
@@ -13728,9 +13731,6 @@ msgstr ""
 msgid "Exactly one of %{attributes} is required"
 msgstr ""
 
-msgid "Example: %{ip_address}. %{read_more_link}."
-msgstr ""
-
 msgid "Example: @sub\\.company\\.com$"
 msgstr ""
 
@@ -16357,9 +16357,15 @@ msgstr ""
 msgid "GroupSettings|Allow project access token creation"
 msgstr ""
 
+msgid "GroupSettings|Applied to all subgroups unless overridden by a group owner. Groups already added to the project lose access."
+msgstr ""
+
 msgid "GroupSettings|Auto DevOps pipeline was updated for the group"
 msgstr ""
 
+msgid "GroupSettings|Available only on the top-level group. Applies to all subgroups. Groups already shared with a group outside %{group} are still shared unless removed manually."
+msgstr ""
+
 msgid "GroupSettings|Badges"
 msgstr ""
 
@@ -16411,6 +16417,9 @@ msgstr ""
 msgid "GroupSettings|New runners registration token has been generated!"
 msgstr ""
 
+msgid "GroupSettings|Overrides user notification preferences for all members of the group, subgroups, and projects."
+msgstr ""
+
 msgid "GroupSettings|Pipeline settings was updated for the group"
 msgstr ""
 
@@ -16423,12 +16432,15 @@ msgstr ""
 msgid "GroupSettings|Prevent forking setting was not saved"
 msgstr ""
 
-msgid "GroupSettings|Prevent members from sending invitations to groups outside of %{group} and its subgroups."
+msgid "GroupSettings|Prevent members from sending invitations to groups outside of %{group} and its subgroups"
 msgstr ""
 
 msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
 msgstr ""
 
+msgid "GroupSettings|Prevents group members from being notified if the group is mentioned."
+msgstr ""
+
 msgid "GroupSettings|Projects will be permanently deleted after a %{waiting_period}-day delay. Inherited by subgroups."
 msgstr ""
 
@@ -16465,21 +16477,6 @@ msgstr ""
 msgid "GroupSettings|This setting is applied on %{ancestor_group}. You can override the setting or %{remove_ancestor_share_with_group_lock}."
 msgstr ""
 
-msgid "GroupSettings|This setting is applied to all subgroups unless overridden by a group owner. Groups that have already been added to the project lose access."
-msgstr ""
-
-msgid "GroupSettings|This setting is only available on the top-level group and it applies to all subgroups. Groups that have already been shared with a group outside %{group} will still be shared, and this access will have to be revoked manually."
-msgstr ""
-
-msgid "GroupSettings|This setting will override user notification preferences for all members of the group, subgroups, and projects."
-msgstr ""
-
-msgid "GroupSettings|This setting will prevent group members from being notified if the group is mentioned."
-msgstr ""
-
-msgid "GroupSettings|This setting will prevent group members from forking projects outside of the group."
-msgstr ""
-
 msgid "GroupSettings|Transfer group"
 msgstr ""
 
@@ -23824,6 +23821,9 @@ msgstr ""
 msgid "Only reCAPTCHA v2 is supported:"
 msgstr ""
 
+msgid "Only users from the specified IP address ranges are able to reach this group, including all subgroups, projects, and Git repositories."
+msgstr ""
+
 msgid "Only verified users with an email address in any of these domains can be added to the group."
 msgstr ""
 
@@ -28810,9 +28810,6 @@ msgstr ""
 msgid "Require all users in this group to set up two-factor authentication"
 msgstr ""
 
-msgid "Require all users in this group to setup two-factor authentication"
-msgstr ""
-
 msgid "Required approvals (%{approvals_given} given)"
 msgstr ""
 
@@ -31613,7 +31610,7 @@ msgstr ""
 msgid "Some child epics may be hidden due to applied filters"
 msgstr ""
 
-msgid "Some common domains are not allowed. %{read_more_link}."
+msgid "Some common domains are not allowed. %{learn_more_link}."
 msgstr ""
 
 msgid "Some of the designs you tried uploading did not change:"
@@ -34682,9 +34679,6 @@ msgstr ""
 msgid "This group is linked to a subscription"
 msgstr ""
 
-msgid "This group, including all subgroups, projects and git repositories, will be reachable from only the specified IP address ranges."
-msgstr ""
-
 msgid "This group, its subgroups and projects has been scheduled for removal on %{date}."
 msgstr ""
 
@@ -35141,6 +35135,9 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
+msgid "Time (in hours) that users are allowed to skip forced configuration of two-factor authentication."
+msgstr ""
+
 msgid "Time Spent"
 msgstr ""
 
@@ -40083,6 +40080,9 @@ msgstr ""
 msgid "estimateCommand|%{slash_command} overwrites the total estimated time."
 msgstr ""
 
+msgid "example.com"
+msgstr ""
+
 msgid "exceeds the limit of %{bytes} bytes"
 msgstr ""
 

spec/helpers/groups_helper_spec.rb

@@ -146,7 +146,7 @@ RSpec.describe GroupsHelper do
 
       let(:possible_help_texts) do
         {
-          default_help: "This setting is applied to all subgroups unless overridden by a group owner",
+          default_help: "Applied to all subgroups unless overridden by a group owner.",
           ancestor_locked_but_you_can_override: %r{This setting is applied on <a .+>.+</a>\. You can override the setting or .+},
           ancestor_locked_so_ask_the_owner: /This setting is applied on .+\. To share projects in this group with another group, ask the owner to override the setting or remove the share with group lock from .+/,
           ancestor_locked_and_has_been_overridden: /This setting is applied on .+ and has been overridden on this subgroup/