parent
266fcfb193
commit
6495b8522a
|
@ -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
|
||||||
|
|
|
@ -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,
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
.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) }" }
|
||||||
|
%span.has-tooltip{ ":title" => "(list.label ? list.label.description : '')",
|
||||||
|
data: { container: "body", placement: "bottom" } }
|
||||||
{{ list.title }}
|
{{ 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' }" }
|
||||||
|
|
|
@ -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
|
||||||
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)
|
||||||
|
|
Loading…
Reference in New Issue