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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
11a9389c
Commit
11a9389c
authored
Jun 04, 2018
by
Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix labels showing up with no title
parent
3571b97e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+1
-1
spec/javascripts/labels_select_spec.js
spec/javascripts/labels_select_spec.js
+4
-0
No files found.
app/assets/javascripts/labels_select.js
View file @
11a9389c
...
@@ -426,7 +426,7 @@ export default class LabelsSelect {
...
@@ -426,7 +426,7 @@ export default class LabelsSelect {
const
tpl
=
_
.
template
([
const
tpl
=
_
.
template
([
'
<% _.each(labels, function(label){ %>
'
,
'
<% _.each(labels, function(label){ %>
'
,
'
<a href="<%- issueUpdateURL.slice(0, issueUpdateURL.lastIndexOf("/")) %>?label_name[]=<%- encodeURIComponent(label.title) %>">
'
,
'
<a href="<%- issueUpdateURL.slice(0, issueUpdateURL.lastIndexOf("/")) %>?label_name[]=<%- encodeURIComponent(label.title) %>">
'
,
'
<span class="label has-tooltip color-label" title="<%- label.description %>" style="background-color: <%- label.color %>; color: <%- label.text_color %>;">
'
,
'
<span class="
badge
label has-tooltip color-label" title="<%- label.description %>" style="background-color: <%- label.color %>; color: <%- label.text_color %>;">
'
,
'
<%- label.title %>
'
,
'
<%- label.title %>
'
,
'
</span>
'
,
'
</span>
'
,
'
</a>
'
,
'
</a>
'
,
...
...
spec/javascripts/labels_select_spec.js
View file @
11a9389c
...
@@ -40,5 +40,9 @@ describe('LabelsSelect', () => {
...
@@ -40,5 +40,9 @@ describe('LabelsSelect', () => {
it
(
'
generated label item template has correct label styles
'
,
()
=>
{
it
(
'
generated label item template has correct label styles
'
,
()
=>
{
expect
(
$labelEl
.
find
(
'
span.label
'
).
attr
(
'
style
'
)).
toBe
(
`background-color:
${
label
.
color
}
; color:
${
label
.
text_color
}
;`
);
expect
(
$labelEl
.
find
(
'
span.label
'
).
attr
(
'
style
'
)).
toBe
(
`background-color:
${
label
.
color
}
; color:
${
label
.
text_color
}
;`
);
});
});
it
(
'
generated label item has a badge class
'
,
()
=>
{
expect
(
$labelEl
.
find
(
'
span
'
).
hasClass
(
'
badge
'
)).
toEqual
(
true
);
});
});
});
});
});
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