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
a6516a80
Commit
a6516a80
authored
Oct 14, 2020
by
Kyle Mann
Committed by
Jose Ivan Vargas
Oct 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update button icon
parent
1f89ccc1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
7 deletions
+26
-7
changelogs/unreleased/229327-migrate-bootstrap-button-to-gitlab-ui-glbutton-in-ee-app-assets-ja.yml
...trap-button-to-gitlab-ui-glbutton-in-ee-app-assets-ja.yml
+5
-0
ee/app/assets/javascripts/vue_shared/license_compliance/components/admin_license_management_row.vue
...se_compliance/components/admin_license_management_row.vue
+21
-7
No files found.
changelogs/unreleased/229327-migrate-bootstrap-button-to-gitlab-ui-glbutton-in-ee-app-assets-ja.yml
0 → 100644
View file @
a6516a80
---
title
:
Replace button component
merge_request
:
42716
author
:
type
:
changed
ee/app/assets/javascripts/vue_shared/license_compliance/components/admin_license_management_row.vue
View file @
a6516a80
<
script
>
import
{
mapActions
}
from
'
vuex
'
;
import
{
GlDropdown
,
GlDropdownItem
,
GlLoadingIcon
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlTooltipDirective
,
GlDropdown
,
GlDropdownItem
,
GlLoadingIcon
,
GlIcon
,
GlButton
,
}
from
'
@gitlab/ui
'
;
import
{
getIssueStatusFromLicenseStatus
}
from
'
ee/vue_shared/license_compliance/store/utils
'
;
import
{
LICENSE_MANAGEMENT
}
from
'
ee/vue_shared/license_compliance/store/constants
'
;
import
{
s__
}
from
'
~/locale
'
;
...
...
@@ -16,10 +23,15 @@ export default {
components
:
{
GlDropdown
,
GlDropdownItem
,
GlButton
,
GlLoadingIcon
,
GlIcon
,
IssueStatusIcon
,
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
props
:
{
license
:
{
type
:
Object
,
...
...
@@ -85,16 +97,18 @@ export default {
{{
$options
[
$options
.
LICENSE_APPROVAL_ACTION
.
DENY
]
}}
</gl-dropdown-item>
</gl-dropdown>
<button
<gl-button
v-gl-tooltip
:title=
"__('Remove license')"
:aria-label=
"__('Remove license')"
:disabled=
"loading"
class=
"btn btn-blank js-remove-button"
type=
"button"
icon=
"remove"
class=
"js-remove-button gl-ml-3"
category=
"tertiary"
data-toggle=
"modal"
data-target=
"#modal-license-delete-confirmation"
@
click=
"setLicenseInModal(license)"
>
<gl-icon
name=
"remove"
/>
</button>
/>
</div>
</div>
</div>
...
...
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