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
6ca3d401
Commit
6ca3d401
authored
Sep 15, 2020
by
Kyle Mann
Committed by
Natalia Tepluhina
Sep 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace deprecated button
parent
7efa4369
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
13 deletions
+19
-13
ee/app/assets/javascripts/licenses/components/license_cards_list.vue
...ts/javascripts/licenses/components/license_cards_list.vue
+4
-4
ee/spec/frontend/licenses/components/__snapshots__/license_cards_list_spec.js.snap
.../components/__snapshots__/license_cards_list_spec.js.snap
+15
-9
No files found.
ee/app/assets/javascripts/licenses/components/license_cards_list.vue
View file @
6ca3d401
<
script
>
<
script
>
import
{
mapState
,
mapGetters
}
from
'
vuex
'
;
import
{
mapState
,
mapGetters
}
from
'
vuex
'
;
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
LicenseCard
,
SkeletonLicenseCard
}
from
'
./cards
'
;
import
{
LicenseCard
,
SkeletonLicenseCard
}
from
'
./cards
'
;
export
default
{
export
default
{
...
@@ -8,7 +8,7 @@ export default {
...
@@ -8,7 +8,7 @@ export default {
components
:
{
components
:
{
LicenseCard
,
LicenseCard
,
SkeletonLicenseCard
,
SkeletonLicenseCard
,
Gl
Deprecated
Button
,
GlButton
,
},
},
computed
:
{
computed
:
{
...
mapState
([
'
licenses
'
,
'
isLoadingLicenses
'
,
'
newLicensePath
'
]),
...
mapState
([
'
licenses
'
,
'
isLoadingLicenses
'
,
'
newLicensePath
'
]),
...
@@ -22,9 +22,9 @@ export default {
...
@@ -22,9 +22,9 @@ export default {
<div
class=
"d-flex justify-content-between align-items-center"
>
<div
class=
"d-flex justify-content-between align-items-center"
>
<h4>
{{
__
(
'
Instance license
'
)
}}
</h4>
<h4>
{{
__
(
'
Instance license
'
)
}}
</h4>
<gl-
deprecated-
button
class=
"my-3 js-add-license"
variant=
"success"
:href=
"newLicensePath"
>
<gl-button
class=
"my-3 js-add-license"
variant=
"success"
:href=
"newLicensePath"
>
{{
__
(
'
Add license
'
)
}}
{{
__
(
'
Add license
'
)
}}
</gl-
deprecated-
button>
</gl-button>
</div>
</div>
<ul
class=
"license-list list-unstyled"
>
<ul
class=
"license-list list-unstyled"
>
...
...
ee/spec/frontend/licenses/components/__snapshots__/license_cards_list_spec.js.snap
View file @
6ca3d401
...
@@ -9,16 +9,18 @@ exports[`InstanceCardsList renders a list of license cards 1`] = `
...
@@ -9,16 +9,18 @@ exports[`InstanceCardsList renders a list of license cards 1`] = `
Instance license
Instance license
</h4>
</h4>
<gl-deprecated-button-stub
<gl-button-stub
category="primary"
class="my-3 js-add-license"
class="my-3 js-add-license"
href="/newLicensePath"
href="/newLicensePath"
size="md"
icon=""
size="medium"
variant="success"
variant="success"
>
>
Add license
Add license
</gl-
deprecated-
button-stub>
</gl-button-stub>
</div>
</div>
<ul
<ul
...
@@ -48,16 +50,18 @@ exports[`InstanceCardsList renders a message when there are no licenses 1`] = `
...
@@ -48,16 +50,18 @@ exports[`InstanceCardsList renders a message when there are no licenses 1`] = `
Instance license
Instance license
</h4>
</h4>
<gl-deprecated-button-stub
<gl-button-stub
category="primary"
class="my-3 js-add-license"
class="my-3 js-add-license"
href="/newLicensePath"
href="/newLicensePath"
size="md"
icon=""
size="medium"
variant="success"
variant="success"
>
>
Add license
Add license
</gl-
deprecated-
button-stub>
</gl-button-stub>
</div>
</div>
<ul
<ul
...
@@ -83,16 +87,18 @@ exports[`InstanceCardsList renders a skeleton loading card if loading licenses 1
...
@@ -83,16 +87,18 @@ exports[`InstanceCardsList renders a skeleton loading card if loading licenses 1
Instance license
Instance license
</h4>
</h4>
<gl-deprecated-button-stub
<gl-button-stub
category="primary"
class="my-3 js-add-license"
class="my-3 js-add-license"
href="/newLicensePath"
href="/newLicensePath"
size="md"
icon=""
size="medium"
variant="success"
variant="success"
>
>
Add license
Add license
</gl-
deprecated-
button-stub>
</gl-button-stub>
</div>
</div>
<ul
<ul
...
...
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