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
043f2654
Commit
043f2654
authored
Sep 28, 2020
by
Neil McCorrison
Committed by
Vitaly Slobodin
Sep 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated licenses page to use non-deprecated GLBadge
parent
3ae04e5c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
ee/app/assets/javascripts/license_compliance/components/licenses_table_row.vue
...ipts/license_compliance/components/licenses_table_row.vue
+3
-3
ee/changelogs/unreleased/213789-swap-out-license-policy-badge.yml
...elogs/unreleased/213789-swap-out-license-policy-badge.yml
+5
-0
ee/spec/frontend/license_compliance/components/licenses_table_row_spec.js
.../license_compliance/components/licenses_table_row_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/license_compliance/components/licenses_table_row.vue
View file @
043f2654
...
...
@@ -2,7 +2,7 @@
import
{
GlLink
,
GlDeprecatedSkeletonLoading
as
GlSkeletonLoading
,
Gl
DeprecatedBadge
as
Gl
Badge
,
GlBadge
,
GlIcon
,
GlFriendlyWrap
,
}
from
'
@gitlab/ui
'
;
...
...
@@ -82,8 +82,8 @@ export default {
<license-component-links
:components=
"license.components"
:title=
"license.name"
/>
<div
v-if=
"isDenied"
class=
"d-inline-block"
>
<!-- This badge usage will be simplified in https://gitlab.com/gitlab-org/gitlab/-/issues/213789 -->
<gl-badge
variant=
"warning"
class=
"gl-alert-warning d-flex align-items-center"
>
<gl-icon
name=
"warning"
:size=
"16"
class=
"p
r-1"
/>
<gl-badge
variant=
"warning"
>
<gl-icon
name=
"warning"
class=
"m
r-1"
/>
<span>
{{ s__('Licenses|Policy violation: denied') }}
</span>
</gl-badge>
</div>
...
...
ee/changelogs/unreleased/213789-swap-out-license-policy-badge.yml
0 → 100644
View file @
043f2654
---
title
:
Updated license compliance policy violation indicator styling
merge_request
:
43447
author
:
type
:
changed
ee/spec/frontend/license_compliance/components/licenses_table_row_spec.js
View file @
043f2654
...
...
@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils';
import
{
GlLink
,
GlDeprecatedSkeletonLoading
as
GlSkeletonLoading
,
Gl
DeprecatedBadge
as
Gl
Badge
,
GlBadge
,
GlFriendlyWrap
,
}
from
'
@gitlab/ui
'
;
import
LicenseComponentLinks
from
'
ee/license_compliance/components/license_component_links.vue
'
;
...
...
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