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
1c257ff7
Commit
1c257ff7
authored
Aug 21, 2020
by
Juan J. Ramirez
Committed by
Miguel Rincon
Aug 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrating old icon button in Approval Rules to GlIcon
parent
654470c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
changelogs/unreleased/private-group-btn.yml
changelogs/unreleased/private-group-btn.yml
+5
-0
ee/app/assets/javascripts/approvals/components/hidden_groups_item.vue
...s/javascripts/approvals/components/hidden_groups_item.vue
+8
-11
No files found.
changelogs/unreleased/private-group-btn.yml
0 → 100644
View file @
1c257ff7
---
title
:
Migration of old icon button to component button in Approval Rules (private groups)
merge_request
:
39769
author
:
type
:
changed
ee/app/assets/javascripts/approvals/components/hidden_groups_item.vue
View file @
1c257ff7
<
script
>
<
script
>
import
{
GlTooltipDirective
,
GlDeprecatedButton
}
from
'
@gitlab/ui
'
;
import
{
GlTooltipDirective
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
GlDeprecatedButton
,
GlIcon
,
Icon
,
},
},
directives
:
{
directives
:
{
GlTooltip
:
GlTooltipDirective
,
GlTooltip
:
GlTooltipDirective
,
...
@@ -16,16 +14,15 @@ export default {
...
@@ -16,16 +14,15 @@ export default {
<
template
>
<
template
>
<div
class=
"d-flex align-items-center"
>
<div
class=
"d-flex align-items-center"
>
<div
class=
"square s24 d-flex-center mr-2 text-tertiary"
>
<div
class=
"square s24 d-flex-center mr-2 text-tertiary"
>
<icon
name=
"folder-o"
:size=
"16"
/>
<
gl-
icon
name=
"folder-o"
:size=
"16"
/>
</div>
</div>
<span>
{{
__
(
'
Private group(s)
'
)
}}
</span>
<span>
{{
__
(
'
Private group(s)
'
)
}}
</span>
<gl-
deprecated-butt
on
<gl-
ic
on
v-gl-tooltip
v-gl-tooltip
:title=
"__('One or more groups that you don\'t have access to.')"
:title=
"__('One or more groups that you don\'t have access to.')"
variant=
"blank"
class=
"ml-1 gl-text-gray-500"
class=
"ml-1 text-secondary"
name=
"question-o"
>
:size=
"16"
<icon
name=
"question-o"
:size=
"16"
/>
/>
</gl-deprecated-button>
</div>
</div>
</
template
>
</
template
>
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