From 0fad3d1ea6cd3720122af50fde9f36443a925a44 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 17 May 2018 15:14:33 +0100
Subject: Revert "Merge branch 'osw-fix-boards-list-header-color' into
 'master'"

This reverts commit 0e8f3d8e71c5a0306187176995d4f25515b563f8.
---
 app/models/list.rb                                  | 3 +--
 app/views/shared/boards/components/_board.html.haml | 2 +-
 spec/fixtures/api/schemas/list.json                 | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/models/list.rb b/app/models/list.rb
index 5daf35ef845..918275be142 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -31,8 +31,7 @@ class List < ActiveRecord::Base
       if options.key?(:label)
         json[:label] = label.as_json(
           project: board.project,
-          only: [:id, :title, :description, :color],
-          methods: [:text_color]
+          only: [:id, :title, :description, :color]
         )
       end
     end
diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml
index aea40df41b0..4bff6468bb0 100644
--- a/app/views/shared/boards/components/_board.html.haml
+++ b/app/views/shared/boards/components/_board.html.haml
@@ -15,7 +15,7 @@
           ":title" => '(list.label ? list.label.description : "")',
           data: { container: "body", placement: "bottom" },
           class: "label color-label title board-title-text",
-          ":style" => "{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.textColor ? list.label.textColor : \"#2e2e2e\") }" }
+          ":style" => "{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.text_color ? list.label.text_color : \"#2e2e2e\") }" }
           {{ list.title }}
 
         - if can?(current_user, :admin_list, current_board_parent)
diff --git a/spec/fixtures/api/schemas/list.json b/spec/fixtures/api/schemas/list.json
index 05922df6b81..622a1e40d07 100644
--- a/spec/fixtures/api/schemas/list.json
+++ b/spec/fixtures/api/schemas/list.json
@@ -17,7 +17,6 @@
       "required": [
         "id",
         "color",
-        "text_color",
         "description",
         "title",
         "priority"
@@ -30,7 +29,6 @@
         },
         "description": { "type": ["string", "null"] },
         "title": { "type": "string" },
-        "title": { "text_color": "string" },
         "priority": { "type": ["integer", "null"] }
       }
     },
-- 
cgit v1.2.1