Commit 73dbd818 authored by Jacques Erasmus's avatar Jacques Erasmus

Merge branch '327131-sso-string' into 'master'

Fix SAML SSO git enforcement helper text

See merge request gitlab-org/gitlab!58825
parents 25eb4333 2809b93a
......@@ -21,7 +21,7 @@
%span.form-text.d-inline.font-weight-normal.align-text-bottom.ml-3= s_('GroupSAML|Enforce SSO-access for Git in this group.')
.form-text.text-muted.js-helper-text{ style: "display: #{saml_provider.enabled? ? 'none' : 'block'}" }
%span
= s_('GroupSAML|Before enforcing SSO, enable SAML authentication.')
= s_('GroupSAML|Before enforcing SSO-access for Git, enable SSO-only authentication for web activity.')
- if Feature.enabled?(:group_managed_accounts, group)
.form-group
%label.gl-mt-2.mb-0.js-group-saml-enforced-group-managed-accounts-toggle-area
......
---
title: Fix Group SAML disabled git enforcement text
merge_request: 58825
author:
type: fixed
......@@ -15107,6 +15107,9 @@ msgstr ""
msgid "GroupSAML|Before enforcing SSO, enable SAML authentication."
msgstr ""
msgid "GroupSAML|Before enforcing SSO-access for Git, enable SSO-only authentication for web activity."
msgstr ""
msgid "GroupSAML|Certificate fingerprint"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment