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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
3e93d7f8
Commit
3e93d7f8
authored
Feb 05, 2020
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add blocked icon on issue board card
- Blocked issue displays icon on board - Documentation
parent
22065fbe
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
50 additions
and
1 deletion
+50
-1
app/assets/javascripts/boards/components/issue_card_inner.vue
...assets/javascripts/boards/components/issue_card_inner.vue
+8
-0
app/assets/javascripts/boards/models/issue.js
app/assets/javascripts/boards/models/issue.js
+1
-0
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+4
-0
changelogs/unreleased/34723-visually-differentiate-blocked-issues.yml
...nreleased/34723-visually-differentiate-blocked-issues.yml
+5
-0
doc/user/project/img/issue_boards_blocked_icon_v12_8.png
doc/user/project/img/issue_boards_blocked_icon_v12_8.png
+0
-0
doc/user/project/issue_board.md
doc/user/project/issue_board.md
+8
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/frontend/boards/issue_card_spec.js
spec/frontend/boards/issue_card_spec.js
+21
-1
No files found.
app/assets/javascripts/boards/components/issue_card_inner.vue
View file @
3e93d7f8
...
@@ -161,6 +161,14 @@ export default {
...
@@ -161,6 +161,14 @@ export default {
<div>
<div>
<div
class=
"d-flex board-card-header"
dir=
"auto"
>
<div
class=
"d-flex board-card-header"
dir=
"auto"
>
<h4
class=
"board-card-title append-bottom-0 prepend-top-0"
>
<h4
class=
"board-card-title append-bottom-0 prepend-top-0"
>
<icon
v-if=
"issue.blocked"
v-gl-tooltip
name=
"issue-block"
:title=
"__('Blocked issue')"
class=
"issue-blocked-icon append-right-4"
:aria-label=
"__('Blocked issue')"
/>
<icon
<icon
v-if=
"issue.confidential"
v-if=
"issue.confidential"
v-gl-tooltip
v-gl-tooltip
...
...
app/assets/javascripts/boards/models/issue.js
View file @
3e93d7f8
...
@@ -37,6 +37,7 @@ class ListIssue {
...
@@ -37,6 +37,7 @@ class ListIssue {
this
.
project_id
=
obj
.
project_id
;
this
.
project_id
=
obj
.
project_id
;
this
.
timeEstimate
=
obj
.
time_estimate
;
this
.
timeEstimate
=
obj
.
time_estimate
;
this
.
assignableLabelsEndpoint
=
obj
.
assignable_labels_endpoint
;
this
.
assignableLabelsEndpoint
=
obj
.
assignable_labels_endpoint
;
this
.
blocked
=
obj
.
blocked
;
if
(
obj
.
project
)
{
if
(
obj
.
project
)
{
this
.
project
=
new
IssueProject
(
obj
.
project
);
this
.
project
=
new
IssueProject
(
obj
.
project
);
...
...
app/assets/stylesheets/pages/boards.scss
View file @
3e93d7f8
...
@@ -287,6 +287,10 @@
...
@@ -287,6 +287,10 @@
cursor
:
help
;
cursor
:
help
;
}
}
.issue-blocked-icon
{
color
:
$red-500
;
}
@include
media-breakpoint-down
(
md
)
{
@include
media-breakpoint-down
(
md
)
{
padding
:
$gl-padding-8
;
padding
:
$gl-padding-8
;
}
}
...
...
changelogs/unreleased/34723-visually-differentiate-blocked-issues.yml
0 → 100644
View file @
3e93d7f8
---
title
:
Add blocked icon on issue board card
merge_request
:
24420
author
:
type
:
added
doc/user/project/img/issue_boards_blocked_icon_v12_8.png
0 → 100644
View file @
3e93d7f8
64.8 KB
doc/user/project/issue_board.md
View file @
3e93d7f8
...
@@ -303,6 +303,14 @@ Different issue board features are available in different [GitLab tiers](https:/
...
@@ -303,6 +303,14 @@ Different issue board features are available in different [GitLab tiers](https:/
| Premium / Silver | Multiple | Multiple | Yes | Yes |
| Premium / Silver | Multiple | Multiple | Yes | Yes |
| Ultimate / Gold | Multiple | Multiple | Yes | Yes |
| Ultimate / Gold | Multiple | Multiple | Yes | Yes |
## Blocked issues
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/34723) in GitLab 12.8.
If an issue is blocked by another issue, an icon will display next to its title to differentiate it from unblocked issues.
![
Blocked issues
](
img/issue_boards_blocked_icon_v12_8.png
)
## Actions you can take on an Issue Board
## Actions you can take on an Issue Board
-
[
Create a new list
](
#creating-a-new-list
)
.
-
[
Create a new list
](
#creating-a-new-list
)
.
...
...
locale/gitlab.pot
View file @
3e93d7f8
...
@@ -2768,6 +2768,9 @@ msgstr ""
...
@@ -2768,6 +2768,9 @@ msgstr ""
msgid "Blocked"
msgid "Blocked"
msgstr ""
msgstr ""
msgid "Blocked issue"
msgstr ""
msgid "Blocks"
msgid "Blocks"
msgstr ""
msgstr ""
...
...
spec/frontend/boards/issue_card_spec.js
View file @
3e93d7f8
...
@@ -66,7 +66,11 @@ describe('Issue card component', () => {
...
@@ -66,7 +66,11 @@ describe('Issue card component', () => {
});
});
it
(
'
does not render confidential icon
'
,
()
=>
{
it
(
'
does not render confidential icon
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.fa-eye-flash
'
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
'
.confidential-icon
'
).
exists
()).
toBe
(
false
);
});
it
(
'
does not render blocked icon
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.issue-blocked-icon
'
).
exists
()).
toBe
(
false
);
});
});
it
(
'
renders confidential icon
'
,
done
=>
{
it
(
'
renders confidential icon
'
,
done
=>
{
...
@@ -324,4 +328,20 @@ describe('Issue card component', () => {
...
@@ -324,4 +328,20 @@ describe('Issue card component', () => {
.
catch
(
done
.
fail
);
.
catch
(
done
.
fail
);
});
});
});
});
describe
(
'
blocked
'
,
()
=>
{
beforeEach
(
done
=>
{
wrapper
.
setProps
({
issue
:
{
...
wrapper
.
props
(
'
issue
'
),
blocked
:
true
,
},
});
wrapper
.
vm
.
$nextTick
(
done
);
});
it
(
'
renders blocked icon if issue is blocked
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.issue-blocked-icon
'
).
exists
()).
toBe
(
true
);
});
});
});
});
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