summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-04-24 11:48:46 +0000
committerSean McGivern <sean@gitlab.com>2019-04-24 11:48:46 +0000
commit4f2005df1dc7ca91673ae4ed5ef35130c714ddd9 (patch)
tree48a91db0bfe7a98d7fd7aef49932b79ca8f7686b /app/helpers
parent8e418477879024ec0074dafe45289ab463de93e5 (diff)
parent7804604687b4f2791174d495dbf61b3a568df36a (diff)
downloadgitlab-ce-4f2005df1dc7ca91673ae4ed5ef35130c714ddd9.tar.gz
Merge branch '10504-single-codebase-ce' into 'master'
Add Epics in issuable list when EE See merge request gitlab-org/gitlab-ce!27545
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/labels_helper.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index b7f693f723f..76300e791e6 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -242,6 +242,10 @@ module LabelsHelper
klass.new(hash.slice(:color, :description, :title, :group_id, :project_id))
end
+ def issuable_types
+ ['issues', 'merge requests']
+ end
+
# Required for Banzai::Filter::LabelReferenceFilter
module_function :render_colored_label, :text_color_for_bg, :escape_once, :label_tooltip_title
end