Merge branch '10504-single-codebase' into 'master'

Add Epics in issuable list when EE

Closes #10504

See merge request gitlab-org/gitlab-ee!11358

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

app/views/groups/labels/index.html.haml

+- @no_container = true
 - page_title 'Labels'
 - can_admin_label = can?(current_user, :admin_label, @group)
-- issuables = ['issues', 'merge requests'] + (@group&.feature_available?(:epics) ? ['epics'] : [])
 - search = params[:search]
 - subscribed = params[:subscribed]
 - labels_or_filters = @labels.exists? || search.present? || subscribed.present?
@@ -13,7 +13,7 @@
     .labels-container.prepend-top-5
       - if @labels.any?
         .text-muted
-          = _('Labels can be applied to %{features}. Group labels are available for any project within the group.') % { features: issuables.to_sentence }
+          = _('Labels can be applied to %{features}. Group labels are available for any project within the group.') % { features: issuable_types.to_sentence }
         .other-labels
           %h5= _('Labels')
           %ul.content-list.manage-labels-list.js-other-labels

ee/app/helpers/ee/labels_helper.rb

@@ -43,6 +43,12 @@ module EE
       })
     end
 
+    def issuable_types
+      return super unless @group&.feature_available?(:epics)
+
+      super + ['epics']
+    end
+
     module_function :scoped_label_wrapper, :scoped_labels_doc_link, :label_tooltip_title
   end
 end