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
2ff20c6d
Commit
2ff20c6d
authored
Oct 22, 2020
by
Jannik Lehmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace GlDeprecatedBadge in license_compliance/components/app
parent
e345840a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ee/app/assets/javascripts/license_compliance/components/app.vue
.../assets/javascripts/license_compliance/components/app.vue
+3
-3
ee/spec/frontend/license_compliance/components/app_spec.js
ee/spec/frontend/license_compliance/components/app_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/license_compliance/components/app.vue
View file @
2ff20c6d
...
...
@@ -7,7 +7,7 @@ import {
GlIcon
,
GlTab
,
GlTabs
,
Gl
DeprecatedBadge
as
Gl
Badge
,
GlBadge
,
GlAlert
,
}
from
'
@gitlab/ui
'
;
import
{
LICENSE_MANAGEMENT
}
from
'
ee/vue_shared/license_compliance/store/constants
'
;
...
...
@@ -135,7 +135,7 @@ export default {
<gl-tab
data-testid=
"licensesTab"
>
<
template
#title
>
<span
data-testid=
"licensesTabTitle"
>
{{
s__
(
'
Licenses|Detected in Project
'
)
}}
</span>
<gl-badge
pill
>
{{
licenseCount
}}
</gl-badge>
<gl-badge>
{{
licenseCount
}}
</gl-badge>
</
template
>
<detected-licenses-table
/>
...
...
@@ -146,7 +146,7 @@ export default {
<span
data-qa-selector=
"policies_tab"
data-testid=
"policiesTabTitle"
>
{{
s__
(
'
Licenses|Policies
'
)
}}
</span>
<gl-badge
pill
>
{{
policyCount
}}
</gl-badge>
<gl-badge>
{{
policyCount
}}
</gl-badge>
</
template
>
<license-management
/>
...
...
ee/spec/frontend/license_compliance/components/app_spec.js
View file @
2ff20c6d
...
...
@@ -8,7 +8,7 @@ import {
GlTab
,
GlTabs
,
GlAlert
,
Gl
DeprecatedBadge
as
Gl
Badge
,
GlBadge
,
}
from
'
@gitlab/ui
'
;
import
{
TEST_HOST
}
from
'
helpers/test_constants
'
;
import
setWindowLocation
from
'
helpers/set_window_location_helper
'
;
...
...
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