summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBranka Martinovic <branka.martinovic@live.com>2017-09-06 16:42:24 +0200
committerRémy Coutable <remy@rymai.me>2018-03-29 14:05:32 +0200
commitd9f1463b4f55a05f75056c4868a03ba3a3b31f69 (patch)
tree2db5df6b4e53757594f98cf18f6097d86cd4f7dc
parent8230b774b5a6375d9b84c71e72c8e41e3bfd7fad (diff)
downloadgitlab-ce-brancho/gitlab-ce-Link_to_project_labels_page.tar.gz
Always display Labels section in issuable sidebar, even when the project has no labelsbrancho/gitlab-ce-Link_to_project_labels_page
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--app/views/shared/issuable/_sidebar.html.haml2
-rw-r--r--changelogs/unreleased/Link_to_project_labels_page.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index adaddda13eb..6afcd447f28 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -84,7 +84,7 @@
= dropdown_content do
.js-due-date-calendar
- - if @labels && @labels.any?
+ - if @labels
- selected_labels = issuable.labels
.block.labels
.sidebar-collapsed-icon.js-sidebar-labels-tooltip{ title: issuable_labels_tooltip(issuable.labels_array), data: { placement: "left", container: "body" } }
diff --git a/changelogs/unreleased/Link_to_project_labels_page.yml b/changelogs/unreleased/Link_to_project_labels_page.yml
new file mode 100644
index 00000000000..7bdeec423fc
--- /dev/null
+++ b/changelogs/unreleased/Link_to_project_labels_page.yml
@@ -0,0 +1,5 @@
+---
+title: Always display Labels section in issuable sidebar, even when the project has no labels
+merge_request: 18081
+author: Branka Martinovic
+type: fixed