Automatic merge of gitlab-org/gitlab-ce master

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

+---
+title: Resolve issue where list labels did not have the correct text color on creation
+merge_request: 26794
+author: Tucker Chapman
+type: fixed

lib/gitlab/checks/lfs_check.rb

@@ -7,6 +7,7 @@ module Gitlab
       ERROR_MESSAGE = 'LFS objects are missing. Ensure LFS is properly set up or try a manual "git lfs push --all".'.freeze
 
       def validate!
+        return unless Feature.enabled?(:lfs_check, default_enabled: true)
         return unless project.lfs_enabled?
         return if skip_lfs_integrity_check
 

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',
   },
 };
 

spec/lib/gitlab/checks/lfs_check_spec.rb

@@ -27,6 +27,18 @@ describe Gitlab::Checks::LfsCheck do
         allow(project).to receive(:lfs_enabled?).and_return(true)
       end
 
+      context 'with lfs_check feature disabled' do
+        before do
+          stub_feature_flags(lfs_check: false)
+        end
+
+        it 'skips integrity check' do
+          expect_any_instance_of(Gitlab::Git::LfsChanges).not_to receive(:new_pointers)
+
+          subject.validate!
+        end
+      end
+
       context 'deletion' do
         let(:changes) { { oldrev: oldrev, ref: ref } }