diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-29 14:26:23 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-29 14:26:23 +0000 |
| commit | ed3f1713234e41b852fbbb1e3a6c5bad19990010 (patch) | |
| tree | a1c8b2de891531a6a69c540187723c3f25e6a7d4 | |
| parent | 705e174b209cbcc2e5be69eb3b2895022adf17a7 (diff) | |
| parent | d9f1463b4f55a05f75056c4868a03ba3a3b31f69 (diff) | |
| download | gitlab-ce-ed3f1713234e41b852fbbb1e3a6c5bad19990010.tar.gz | |
Merge branch 'brancho/gitlab-ce-Link_to_project_labels_page' into 'master'
Always display Labels section in issuable sidebar, even when the project has no labels
Closes #23472
See merge request gitlab-org/gitlab-ce!18081
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/Link_to_project_labels_page.yml | 5 |
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 |