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
8cce6308
Commit
8cce6308
authored
Oct 18, 2018
by
James Edwards-Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Group SAML settings SSO link includes token
parent
11110e6c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
ee/app/views/groups/saml_providers/_info.html.haml
ee/app/views/groups/saml_providers/_info.html.haml
+1
-1
ee/spec/features/groups/saml_providers_spec.rb
ee/spec/features/groups/saml_providers_spec.rb
+2
-1
No files found.
ee/app/views/groups/saml_providers/_info.html.haml
View file @
8cce6308
...
...
@@ -30,6 +30,6 @@
-
if
@saml_provider
.
persisted?
.well-segment.borderless
%label
=
_
(
"GitLab single sign on URL"
)
-
user_login_url
=
sso_group_saml_providers_url
(
@group
)
-
user_login_url
=
sso_group_saml_providers_url
(
@group
,
token:
@group
.
saml_discovery_token
)
%div
=
link_to
user_login_url
,
user_login_url
,
class:
"qa-user-login-url-link"
.form-text.text-muted
=
_
(
"Used by members to sign in to your group in GitLab"
)
ee/spec/features/groups/saml_providers_spec.rb
View file @
8cce6308
...
...
@@ -92,7 +92,8 @@ describe 'SAML provider settings' do
login_url
=
find
(
'label'
,
text:
'GitLab single sign on URL'
).
find
(
'~* a'
).
text
expect
(
login_url
).
to
end_with
"/groups/
#{
group
.
full_path
}
/-/saml/sso"
expect
(
login_url
).
to
include
"/groups/
#{
group
.
full_path
}
/-/saml/sso"
expect
(
login_url
).
to
end_with
"?token=
#{
group
.
reload
.
saml_discovery_token
}
"
end
context
'enforced sso enabled'
do
...
...
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