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
314fbd40
Commit
314fbd40
authored
Apr 23, 2019
by
Tucker Chapman
Committed by
Fatih Acet
Apr 23, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue with list label text color
parent
6c913f2c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
0 deletions
+10
-0
app/assets/javascripts/boards/models/list.js
app/assets/javascripts/boards/models/list.js
+1
-0
changelogs/unreleased/47584-label-text-color.yml
changelogs/unreleased/47584-label-text-color.yml
+5
-0
spec/javascripts/boards/list_spec.js
spec/javascripts/boards/list_spec.js
+3
-0
spec/javascripts/boards/mock_data.js
spec/javascripts/boards/mock_data.js
+1
-0
No files found.
app/assets/javascripts/boards/models/list.js
View file @
314fbd40
...
@@ -90,6 +90,7 @@ class List {
...
@@ -90,6 +90,7 @@ class List {
this
.
id
=
data
.
id
;
this
.
id
=
data
.
id
;
this
.
type
=
data
.
list_type
;
this
.
type
=
data
.
list_type
;
this
.
position
=
data
.
position
;
this
.
position
=
data
.
position
;
this
.
label
=
data
.
label
;
return
this
.
getIssues
();
return
this
.
getIssues
();
});
});
...
...
changelogs/unreleased/47584-label-text-color.yml
0 → 100644
View file @
314fbd40
---
title
:
Resolve issue where list labels did not have the correct text color on creation
merge_request
:
26794
author
:
Tucker Chapman
type
:
fixed
spec/javascripts/boards/list_spec.js
View file @
314fbd40
...
@@ -45,6 +45,7 @@ describe('List model', () => {
...
@@ -45,6 +45,7 @@ describe('List model', () => {
id
:
_
.
random
(
10000
),
id
:
_
.
random
(
10000
),
title
:
'
test
'
,
title
:
'
test
'
,
color
:
'
red
'
,
color
:
'
red
'
,
text_color
:
'
white
'
,
},
},
});
});
list
.
save
();
list
.
save
();
...
@@ -53,6 +54,8 @@ describe('List model', () => {
...
@@ -53,6 +54,8 @@ describe('List model', () => {
expect
(
list
.
id
).
toBe
(
listObj
.
id
);
expect
(
list
.
id
).
toBe
(
listObj
.
id
);
expect
(
list
.
type
).
toBe
(
'
label
'
);
expect
(
list
.
type
).
toBe
(
'
label
'
);
expect
(
list
.
position
).
toBe
(
0
);
expect
(
list
.
position
).
toBe
(
0
);
expect
(
list
.
label
.
color
).
toBe
(
'
red
'
);
expect
(
list
.
label
.
textColor
).
toBe
(
'
white
'
);
done
();
done
();
},
0
);
},
0
);
});
});
...
...
spec/javascripts/boards/mock_data.js
View file @
314fbd40
...
@@ -16,6 +16,7 @@ export const listObj = {
...
@@ -16,6 +16,7 @@ export const listObj = {
title
:
'
Testing
'
,
title
:
'
Testing
'
,
color
:
'
red
'
,
color
:
'
red
'
,
description
:
'
testing;
'
,
description
:
'
testing;
'
,
textColor
:
'
white
'
,
},
},
};
};
...
...
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