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
4fb9bf94
Commit
4fb9bf94
authored
Feb 25, 2022
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab master
parents
d7f7ed91
411796f5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
ee/app/assets/javascripts/dependencies/components/dependency_location.vue
...vascripts/dependencies/components/dependency_location.vue
+1
-0
ee/app/views/groups/saml_group_links/_saml_group_link.html.haml
.../views/groups/saml_group_links/_saml_group_link.html.haml
+2
-1
No files found.
ee/app/assets/javascripts/dependencies/components/dependency_location.vue
View file @
4fb9bf94
...
...
@@ -75,6 +75,7 @@ export default {
<gl-icon
v-else
name=
"doc-text"
/>
<gl-truncate
class=
"gl-lg-max-w-80p gl-display-none gl-lg-display-inline-flex"
position=
"start"
:text=
"locationPath"
with-tooltip
/>
...
...
ee/app/views/groups/saml_group_links/_saml_group_link.html.haml
View file @
4fb9bf94
%li
.float-right
=
link_to
group_saml_group_link_path
(
group
,
saml_group_link
),
method: :delete
,
class:
'btn gl-button btn-danger btn-sm'
,
data:
{
confirm:
s_
(
'GroupSAML|Are you sure you want to remove the SAML group link?'
)
}
do
=
link_to
group_saml_group_link_path
(
group
,
saml_group_link
),
method: :delete
,
class:
'btn gl-button btn-danger btn-sm'
,
'aria-label'
:
_
(
'Remove link'
),
data:
{
confirm:
s_
(
'GroupSAML|Are you sure you want to remove the SAML group link?'
),
'confirm-btn-variant'
:
'danger'
}
do
=
sprite_icon
(
'unlink'
,
size:
12
,
css_class:
'gl-m-0!'
)
%span
=
_
(
'Remove'
)
%strong
=
s_
(
'GroupSAML|SAML Group Name: %{saml_group_name}'
)
%
{
saml_group_name:
saml_group_link
.
saml_group_name
}
...
...
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