BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
0fad3d1e
Commit
0fad3d1e
authored
May 17, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'osw-fix-boards-list-header-color' into 'master'"
This reverts commit
0e8f3d8e
.
parent
92857b0d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
5 deletions
+2
-5
list.rb
app/models/list.rb
+1
-2
_board.html.haml
app/views/shared/boards/components/_board.html.haml
+1
-1
list.json
spec/fixtures/api/schemas/list.json
+0
-2
No files found.
app/models/list.rb
View file @
0fad3d1e
...
...
@@ -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
...
...
app/views/shared/boards/components/_board.html.haml
View file @
0fad3d1e
...
...
@@ -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.text
Color ? list.label.textC
olor :
\"
#2e2e2e
\"
) }"
}
":style"
=>
"{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.text
_color ? list.label.text_c
olor :
\"
#2e2e2e
\"
) }"
}
{{ list.title }}
-
if
can?
(
current_user
,
:admin_list
,
current_board_parent
)
...
...
spec/fixtures/api/schemas/list.json
View file @
0fad3d1e
...
...
@@ -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"
]
}
}
},
...
...
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