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
39081051
Commit
39081051
authored
Dec 15, 2020
by
Alexander Turinske
Committed by
Phil Hughes
Dec 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert group saml buttons to gl-button styles
parent
900f072e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
ee/app/views/groups/saml_providers/_scim_token.html.haml
ee/app/views/groups/saml_providers/_scim_token.html.haml
+2
-2
ee/changelogs/unreleased/231221-convert-saml-butons-to-gl.yml
...hangelogs/unreleased/231221-convert-saml-butons-to-gl.yml
+5
-0
No files found.
ee/app/views/groups/saml_providers/_scim_token.html.haml
View file @
39081051
-
scim_token_not_present
=
@scim_token_url
.
nil?
.gl-mt-3.js-generate-scim-token-container
{
class:
"#{ 'd-none' unless scim_token_not_present}"
}
%p
=
s_
(
'GroupSAML|Generate a SCIM token to set up your System for Cross-Domain Identity Management.'
)
%button
.btn.
btn_default.btn-white
.js-generate-scim-token
{
type:
'button'
}
%button
.btn.
gl-button
.js-generate-scim-token
{
type:
'button'
}
=
s_
(
'GroupSAML|Generate a SCIM token'
)
.gl-mt-3.js-scim-token-container
{
class:
"#{ 'd-none' if scim_token_not_present}"
}
.well-segment.borderless.mb-3.col-12.col-lg-9.p-0
...
...
@@ -9,7 +9,7 @@
.form-text.text-muted.js-scim-token-helper-text
%span
=
s_
(
'GroupSAML|The SCIM token is now hidden. To see the value of the token again, you need to '
)
%button
.btn.
btn-default
.btn-link.d-inline.align-baseline.js-reset-scim-token
{
type:
'button'
}
%button
.btn.
gl-button.btn-primary
.btn-link.d-inline.align-baseline.js-reset-scim-token
{
type:
'button'
}
=
_
(
'reset it.'
)
%span
.d-none
=
s_
(
"GroupSAML|Make sure you save this token — you won't be able to access it again."
)
...
...
ee/changelogs/unreleased/231221-convert-saml-butons-to-gl.yml
0 → 100644
View file @
39081051
---
title
:
Convert group saml buttons to gl-button styles
merge_request
:
49852
author
:
type
:
other
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