Commit 3796bbd1 authored by Fatih Acet's avatar Fatih Acet

Merge branch '47584-label-text-color' into 'master'

Fix issue with list label text color

Closes #47584

See merge request gitlab-org/gitlab-ce!26794
parents 6c913f2c 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();
}); });
......
---
title: Resolve issue where list labels did not have the correct text color on creation
merge_request: 26794
author: Tucker Chapman
type: fixed
...@@ -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);
}); });
......
...@@ -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',
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment