Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
6495b852
Commit
6495b852
authored
Oct 07, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds label description to issue board title
Closes #22710
parent
266fcfb1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
3 deletions
+12
-3
CHANGELOG.md
CHANGELOG.md
+1
-0
app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
...javascripts/boards/mixins/sortable_default_options.js.es6
+1
-1
app/views/projects/boards/components/_board.html.haml
app/views/projects/boards/components/_board.html.haml
+3
-1
spec/features/boards/boards_spec.rb
spec/features/boards/boards_spec.rb
+7
-1
No files found.
CHANGELOG.md
View file @
6495b852
...
@@ -14,6 +14,7 @@ Please view this file on the master branch, on stable branches it's out of date.
...
@@ -14,6 +14,7 @@ Please view this file on the master branch, on stable branches it's out of date.
-
Add hover to trash icon in notes !7008 (blackst0ne)
-
Add hover to trash icon in notes !7008 (blackst0ne)
-
Only show one error message for an invalid email !5905 (lycoperdon)
-
Only show one error message for an invalid email !5905 (lycoperdon)
-
Fix sidekiq stats in admin area (blackst0ne)
-
Fix sidekiq stats in admin area (blackst0ne)
-
Added label description as tooltip to issue board list title
-
Created cycle analytics bundle JavaScript file
-
Created cycle analytics bundle JavaScript file
-
API: Fix booleans not recognized as such when using the
`to_boolean`
helper
-
API: Fix booleans not recognized as such when using the
`to_boolean`
helper
-
Removed delete branch tooltip !6954
-
Removed delete branch tooltip !6954
...
...
app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
View file @
6495b852
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
fallbackClass: 'is-dragging',
fallbackClass: 'is-dragging',
fallbackOnBody: true,
fallbackOnBody: true,
ghostClass: 'is-ghost',
ghostClass: 'is-ghost',
filter: '.
has-tooltip
, .btn',
filter: '.
board-delete
, .btn',
delay: gl.issueBoards.touchEnabled ? 100 : 50,
delay: gl.issueBoards.touchEnabled ? 100 : 50,
scrollSensitivity: gl.issueBoards.touchEnabled ? 60 : 100,
scrollSensitivity: gl.issueBoards.touchEnabled ? 60 : 100,
scrollSpeed: 20,
scrollSpeed: 20,
...
...
app/views/projects/boards/components/_board.html.haml
View file @
6495b852
...
@@ -11,7 +11,9 @@
...
@@ -11,7 +11,9 @@
.board-inner
.board-inner
%header
.board-header
{
":class"
=>
"{ 'has-border': list.label }"
,
":style"
=>
"{ borderTopColor: (list.label ? list.label.color : null) }"
}
%header
.board-header
{
":class"
=>
"{ 'has-border': list.label }"
,
":style"
=>
"{ borderTopColor: (list.label ? list.label.color : null) }"
}
%h3
.board-title.js-board-handle
{
":class"
=>
"{ 'user-can-drag': (!disabled && !list.preset) }"
}
%h3
.board-title.js-board-handle
{
":class"
=>
"{ 'user-can-drag': (!disabled && !list.preset) }"
}
{{ list.title }}
%span
.has-tooltip
{
":title"
=>
"(list.label ? list.label.description : '')"
,
data:
{
container:
"body"
,
placement:
"bottom"
}
}
{{ list.title }}
.board-issue-count-holder.pull-right.clearfix
{
"v-if"
=>
"list.type !== 'blank'"
}
.board-issue-count-holder.pull-right.clearfix
{
"v-if"
=>
"list.type !== 'blank'"
}
%span
.board-issue-count.pull-left
{
":class"
=>
"{ 'has-btn': list.type !== 'done' }"
}
%span
.board-issue-count.pull-left
{
":class"
=>
"{ 'has-btn': list.type !== 'done' }"
}
{{ list.issuesSize }}
{{ list.issuesSize }}
...
...
spec/features/boards/boards_spec.rb
View file @
6495b852
...
@@ -53,7 +53,7 @@ describe 'Issue Boards', feature: true, js: true do
...
@@ -53,7 +53,7 @@ describe 'Issue Boards', feature: true, js: true do
context
'with lists'
do
context
'with lists'
do
let
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
let
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
let
(
:planning
)
{
create
(
:label
,
project:
project
,
name:
'Planning'
)
}
let
(
:planning
)
{
create
(
:label
,
project:
project
,
name:
'Planning'
,
description:
'Test'
)
}
let
(
:development
)
{
create
(
:label
,
project:
project
,
name:
'Development'
)
}
let
(
:development
)
{
create
(
:label
,
project:
project
,
name:
'Development'
)
}
let
(
:testing
)
{
create
(
:label
,
project:
project
,
name:
'Testing'
)
}
let
(
:testing
)
{
create
(
:label
,
project:
project
,
name:
'Testing'
)
}
let
(
:bug
)
{
create
(
:label
,
project:
project
,
name:
'Bug'
)
}
let
(
:bug
)
{
create
(
:label
,
project:
project
,
name:
'Bug'
)
}
...
@@ -91,6 +91,12 @@ describe 'Issue Boards', feature: true, js: true do
...
@@ -91,6 +91,12 @@ describe 'Issue Boards', feature: true, js: true do
expect
(
page
).
to
have_selector
(
'.board'
,
count:
4
)
expect
(
page
).
to
have_selector
(
'.board'
,
count:
4
)
end
end
it
'shows description tooltip on list title'
do
page
.
within
(
'.board:nth-child(2)'
)
do
expect
(
find
(
'.board-title span.has-tooltip'
)[
:title
]).
to
eq
(
'Test'
)
end
end
it
'shows issues in lists'
do
it
'shows issues in lists'
do
wait_for_board_cards
(
2
,
2
)
wait_for_board_cards
(
2
,
2
)
wait_for_board_cards
(
3
,
2
)
wait_for_board_cards
(
3
,
2
)
...
...
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