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

app/assets/javascripts/boards/models/list.js

@@ -90,6 +90,7 @@ class List {
         this.id = data.id;
         this.type = data.list_type;
         this.position = data.position;
+        this.label = data.label;
 
         return this.getIssues();
       });

changelogs/unreleased/47584-label-text-color.yml

@@ -0,0 +1,5 @@
+---
+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

@@ -45,6 +45,7 @@ describe('List model', () => {
         id: _.random(10000),
         title: 'test',
         color: 'red',
+        text_color: 'white',
       },
     });
     list.save();
@@ -53,6 +54,8 @@ describe('List model', () => {
       expect(list.id).toBe(listObj.id);
       expect(list.type).toBe('label');
       expect(list.position).toBe(0);
+      expect(list.label.color).toBe('red');
+      expect(list.label.textColor).toBe('white');
       done();
     }, 0);
   });

spec/javascripts/boards/mock_data.js

@@ -16,6 +16,7 @@ export const listObj = {
     title: 'Testing',
     color: 'red',
     description: 'testing;',
+    textColor: 'white',
   },
 };