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
9070d97e
Commit
9070d97e
authored
Oct 16, 2020
by
Dheeraj Joshi
Committed by
Kushal Pandya
Oct 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Text wrap the license name
Add gl-friendly-wrap component to the license column in dependency list
parent
f89853ea
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
ee/app/assets/javascripts/dependencies/components/dependency_license_links.vue
...ipts/dependencies/components/dependency_license_links.vue
+10
-2
ee/app/assets/javascripts/dependencies/components/dependency_location.vue
...vascripts/dependencies/components/dependency_location.vue
+1
-1
ee/changelogs/unreleased/dj-fix-dep-table.yml
ee/changelogs/unreleased/dj-fix-dep-table.yml
+5
-0
No files found.
ee/app/assets/javascripts/dependencies/components/dependency_license_links.vue
View file @
9070d97e
<
script
>
import
{
uniqueId
}
from
'
lodash
'
;
import
{
GlButton
,
GlLink
,
GlModal
,
GlModalDirective
,
GlIntersperse
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLink
,
GlModal
,
GlModalDirective
,
GlIntersperse
,
GlFriendlyWrap
,
}
from
'
@gitlab/ui
'
;
import
{
sprintf
,
s__
}
from
'
~/locale
'
;
// If there are more licenses than this count, a counter will be displayed for the remaining licenses
...
...
@@ -15,6 +22,7 @@ export default {
GlButton
,
GlLink
,
GlModal
,
GlFriendlyWrap
,
},
directives
:
{
GlModalDirective
,
...
...
@@ -70,7 +78,7 @@ export default {
class=
"js-license-links-license-list-item"
>
<gl-link
v-if=
"license.url"
:href=
"license.url"
target=
"_blank"
>
{{
license
.
name
}}
</gl-link>
<
template
v-else
>
{{
license
.
name
}}
</
template
>
<
gl-friendly-wrap
v-else
:text=
"license.name"
/
>
</span>
<gl-button
v-if=
"hasLicensesInModal"
...
...
ee/app/assets/javascripts/dependencies/components/dependency_location.vue
View file @
9070d97e
...
...
@@ -63,7 +63,7 @@ export default {
<!-- We need to put an extra span to avoid separator between link & popover -->
<span
v-if=
"showMoreLink"
>
<gl-link
ref=
"moreLink"
>
{{
nMoreMessage
}}
</gl-link>
<gl-link
ref=
"moreLink"
class=
"gl-white-space-nowrap"
>
{{
nMoreMessage
}}
</gl-link>
<gl-popover
:target=
"() => $refs.moreLink.$el"
...
...
ee/changelogs/unreleased/dj-fix-dep-table.yml
0 → 100644
View file @
9070d97e
---
title
:
Text wrap the license name in Dependency List
merge_request
:
45242
author
:
type
:
other
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