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
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-02-22 18:44:05 +0300
committerDouwe Maan <douwe@gitlab.com>2017-02-22 18:44:05 +0300
commit765d509a5bd0548961ea7ab1d86bf9302b5298b1 (patch)
tree45c62362baba46c7be270c6e45e3c468e05bab0c /lib
parent55842d4d28d925febc054202dbdf6a6bf1aa5153 (diff)
parent63bd79f594272d98ce022685f26a47ce0afae9d4 (diff)
Merge branch 'zj-fix-slash-command-labels' into 'master'
Chat slash commands show labels correctly Closes #28358 See merge request !9408
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/chat_commands/presenters/issue_base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/chat_commands/presenters/issue_base.rb b/lib/gitlab/chat_commands/presenters/issue_base.rb
index a0058407fb2..054f7f4be0c 100644
--- a/lib/gitlab/chat_commands/presenters/issue_base.rb
+++ b/lib/gitlab/chat_commands/presenters/issue_base.rb
@@ -32,7 +32,7 @@ module Gitlab
},
{
title: "Labels",
- value: @resource.labels.any? ? @resource.label_names : "_None_",
+ value: @resource.labels.any? ? @resource.label_names.join(', ') : "_None_",
short: true
}
]