Move functionality to label[]

1 files changed, 14 insertions, 6 deletions

diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index d5af0116cf8..14e624cb7cf 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -17,15 +17,23 @@ module IssuablesHelper
   end
 
   def multi_label_name(current_labels, default_label)
-    if current_labels.presence
-      if current_labels.include? ','
-        labels = current_labels.split(',')
-        "#{labels[0]} +#{labels.count - 1} more"
+    # current_labels may be a string from before
+    if current_labels.respond_to?('any?')
+      if current_labels.any?
+        if current_labels.count > 1
+          "#{current_labels[0]} +#{current_labels.count - 1} more"
+        else
+          current_labels[0]
+        end
       else
-        current_labels
+        default_label
       end
     else
-      default_label
+      if current_labels.nil?
+        default_label
+      else
+        current_labels
+      end
     end
   end