Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-12-28 17:08:09 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-12-28 17:08:09 +0300
commit17b878dae5a9edad3465f4345b48418d21f37ad8 (patch)
tree30eb132759b89f8fd10b4b396c525a8f5ede25a1
parent1f16d214db6e688ac2c6e0731eb183f08f916a0d (diff)
parent148c7533d701490eb5cd8aebc4fa033e0f0f6ec4 (diff)
Merge branch 'show_proper_labels_in_board_issue_sidebar_when_issue_is_closed' into 'master'
show None when issue is in closed list and no labels assigned Closes #40975 See merge request gitlab-org/gitlab-ce!15976
-rw-r--r--app/assets/javascripts/boards/boards_bundle.js1
-rw-r--r--changelogs/unreleased/show_proper_labels_in_board_issue_sidebar_when_issue_is_closed.yml5
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/boards_bundle.js b/app/assets/javascripts/boards/boards_bundle.js
index 20d23162940..0c1cff1da7a 100644
--- a/app/assets/javascripts/boards/boards_bundle.js
+++ b/app/assets/javascripts/boards/boards_bundle.js
@@ -102,7 +102,6 @@ $(() => {
if (list.type === 'closed') {
list.position = Infinity;
- list.label = { description: 'Shows all closed issues. Moving an issue to this list closes it' };
} else if (list.type === 'backlog') {
list.position = -1;
}
diff --git a/changelogs/unreleased/show_proper_labels_in_board_issue_sidebar_when_issue_is_closed.yml b/changelogs/unreleased/show_proper_labels_in_board_issue_sidebar_when_issue_is_closed.yml
new file mode 100644
index 00000000000..c2ab34b20a5
--- /dev/null
+++ b/changelogs/unreleased/show_proper_labels_in_board_issue_sidebar_when_issue_is_closed.yml
@@ -0,0 +1,5 @@
+---
+title: show None when issue is in closed list and no labels assigned
+merge_request: 15976
+author: Christiaan Van den Poel
+type: fixed