diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-04-24 11:48:46 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-04-24 11:48:46 +0000 |
| commit | 4f2005df1dc7ca91673ae4ed5ef35130c714ddd9 (patch) | |
| tree | 48a91db0bfe7a98d7fd7aef49932b79ca8f7686b | |
| parent | 8e418477879024ec0074dafe45289ab463de93e5 (diff) | |
| parent | 7804604687b4f2791174d495dbf61b3a568df36a (diff) | |
| download | gitlab-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
| -rw-r--r-- | app/helpers/labels_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/groups/labels/index.html.haml | 5 |
2 files changed, 6 insertions, 3 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 diff --git a/app/views/groups/labels/index.html.haml b/app/views/groups/labels/index.html.haml index a9a73be4045..a8358704b03 100644 --- a/app/views/groups/labels/index.html.haml +++ b/app/views/groups/labels/index.html.haml @@ -1,7 +1,6 @@ - @no_container = true -- page_title "Labels" +- page_title 'Labels' - can_admin_label = can?(current_user, :admin_label, @group) -- issuables = ['issues', 'merge requests'] - search = params[:search] - subscribed = params[:subscribed] - labels_or_filters = @labels.exists? || search.present? || subscribed.present? @@ -14,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 |