Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2809b93a
Commit
2809b93a
authored
Apr 07, 2021
by
Cynthia Arty Ng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix SSO SAML git enforce helper text
parent
fd9486f1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
ee/app/views/groups/saml_providers/_form.html.haml
ee/app/views/groups/saml_providers/_form.html.haml
+1
-1
ee/changelogs/unreleased/327131-sso-string.yml
ee/changelogs/unreleased/327131-sso-string.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/views/groups/saml_providers/_form.html.haml
View file @
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
...
...
ee/changelogs/unreleased/327131-sso-string.yml
0 → 100644
View file @
2809b93a
---
title
:
Fix Group SAML disabled git enforcement text
merge_request
:
58825
author
:
type
:
fixed
locale/gitlab.pot
View file @
2809b93a
...
...
@@ -15050,6 +15050,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 ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment