Merge branch 'alvin-sso-enforcement-text-update' into 'master'

Enhance SSO enforcement warning message

See merge request gitlab-org/gitlab!73233

ee/app/views/groups/saml_providers/_form.html.haml

@@ -15,7 +15,7 @@
             = s_('GroupSAML|Before enforcing SSO, enable SAML authentication.')
           %p.help-text.js-warning{ class: saml_provider.enforced_sso? && 'gl-display-none' }
             - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/saml_sso/index', anchor: 'sso-enforcement') }
-            = html_escape(s_('GroupSAML|%{strongOpen}Warning%{strongClose} - Enabling %{linkStart}SSO enforcement%{linkEnd} can reduce security risks.')) % { strongOpen: '<strong>'.html_safe, strongClose: '</strong>'.html_safe, linkStart: link_start, linkEnd: '</a>'.html_safe }
+            = html_escape(s_('GroupSAML|%{strongOpen}Warning%{strongClose} - Enable %{linkStart}SSO enforcement%{linkEnd} to reduce security risks.')) % { strongOpen: '<strong>'.html_safe, strongClose: '</strong>'.html_safe, linkStart: link_start, linkEnd: '</a>'.html_safe }
     .form-group
       .gl-form-checkbox.custom-control.custom-checkbox
         = f.check_box :git_check_enforced, { class: 'custom-control-input js-group-saml-enforced-git-check-input' }

ee/spec/features/groups/saml_providers_spec.rb

@@ -71,7 +71,7 @@ RSpec.describe 'SAML provider settings' do
 
         uncheck 'Enforce SSO-only authentication for web activity for this group'
 
-        expect(page).to have_content 'Warning - Enabling SSO enforcement can reduce security risks.'
+        expect(page).to have_content 'Warning - Enable SSO enforcement to reduce security risks.'
       end
     end
 
@@ -118,7 +118,7 @@ RSpec.describe 'SAML provider settings' do
         uncheck 'Enforce SSO-only authentication for web activity for this group'
 
         expect { submit }.to change { saml_provider.reload.enforced_sso }.to(false)
-        expect(page).to have_content 'Warning - Enabling SSO enforcement can reduce security risks.'
+        expect(page).to have_content 'Warning - Enable SSO enforcement to reduce security risks.'
       end
 
       context 'enforced_group_managed_accounts enabled', :js do

locale/gitlab.pot

@@ -16495,7 +16495,7 @@ msgstr ""
 msgid "GroupSAML|\"persistent\" recommended"
 msgstr ""
 
-msgid "GroupSAML|%{strongOpen}Warning%{strongClose} - Enabling %{linkStart}SSO enforcement%{linkEnd} can reduce security risks."
+msgid "GroupSAML|%{strongOpen}Warning%{strongClose} - Enable %{linkStart}SSO enforcement%{linkEnd} to reduce security risks."
 msgstr ""
 
 msgid "GroupSAML|Active SAML Group Links (%{count})"