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
d8c31664
Commit
d8c31664
authored
Nov 18, 2021
by
Alvin Gounder
Committed by
Peter Hegman
Nov 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enhance SSO enforcement warning message
Changelog: other EE: true
parent
63d7b0b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
ee/app/views/groups/saml_providers/_form.html.haml
ee/app/views/groups/saml_providers/_form.html.haml
+1
-1
ee/spec/features/groups/saml_providers_spec.rb
ee/spec/features/groups/saml_providers_spec.rb
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
ee/app/views/groups/saml_providers/_form.html.haml
View file @
d8c31664
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
=
s_
(
'GroupSAML|Before enforcing SSO, enable SAML authentication.'
)
=
s_
(
'GroupSAML|Before enforcing SSO, enable SAML authentication.'
)
%p
.help-text.js-warning
{
class:
saml_provider
.
enforced_sso?
&&
'gl-display-none'
}
%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'
)
}
-
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} - Enabl
ing %{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} - Enabl
e %{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
.form-group
.gl-form-checkbox.custom-control.custom-checkbox
.gl-form-checkbox.custom-control.custom-checkbox
=
f
.
check_box
:git_check_enforced
,
{
class:
'custom-control-input js-group-saml-enforced-git-check-input'
}
=
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
View file @
d8c31664
...
@@ -71,7 +71,7 @@ RSpec.describe 'SAML provider settings' do
...
@@ -71,7 +71,7 @@ RSpec.describe 'SAML provider settings' do
uncheck
'Enforce SSO-only authentication for web activity for this group'
uncheck
'Enforce SSO-only authentication for web activity for this group'
expect
(
page
).
to
have_content
'Warning - Enabl
ing SSO enforcement can
reduce security risks.'
expect
(
page
).
to
have_content
'Warning - Enabl
e SSO enforcement to
reduce security risks.'
end
end
end
end
...
@@ -118,7 +118,7 @@ RSpec.describe 'SAML provider settings' do
...
@@ -118,7 +118,7 @@ RSpec.describe 'SAML provider settings' do
uncheck
'Enforce SSO-only authentication for web activity for this group'
uncheck
'Enforce SSO-only authentication for web activity for this group'
expect
{
submit
}.
to
change
{
saml_provider
.
reload
.
enforced_sso
}.
to
(
false
)
expect
{
submit
}.
to
change
{
saml_provider
.
reload
.
enforced_sso
}.
to
(
false
)
expect
(
page
).
to
have_content
'Warning - Enabl
ing SSO enforcement can
reduce security risks.'
expect
(
page
).
to
have_content
'Warning - Enabl
e SSO enforcement to
reduce security risks.'
end
end
context
'enforced_group_managed_accounts enabled'
,
:js
do
context
'enforced_group_managed_accounts enabled'
,
:js
do
...
...
locale/gitlab.pot
View file @
d8c31664
...
@@ -16495,7 +16495,7 @@ msgstr ""
...
@@ -16495,7 +16495,7 @@ msgstr ""
msgid "GroupSAML|\"persistent\" recommended"
msgid "GroupSAML|\"persistent\" recommended"
msgstr ""
msgstr ""
msgid "GroupSAML|%{strongOpen}Warning%{strongClose} - Enabl
ing %{linkStart}SSO enforcement%{linkEnd} can
reduce security risks."
msgid "GroupSAML|%{strongOpen}Warning%{strongClose} - Enabl
e %{linkStart}SSO enforcement%{linkEnd} to
reduce security risks."
msgstr ""
msgstr ""
msgid "GroupSAML|Active SAML Group Links (%{count})"
msgid "GroupSAML|Active SAML Group Links (%{count})"
...
...
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