diff options
| author | Rajat Jain <rjain@gitlab.com> | 2019-04-22 11:24:23 +0530 |
|---|---|---|
| committer | Rajat Jain <rjain@gitlab.com> | 2019-04-24 12:53:49 +0530 |
| commit | f35ad61be174c060630c2c54e4b5de4902fb39b7 (patch) | |
| tree | 7c23cf0e6f3279e40debbbacbaa899793d7d9569 | |
| parent | 10bf3bbc904c96d5d7633f58cb93cf6927e18c8e (diff) | |
| download | gitlab-ce-10504-single-codebase-ce.tar.gz | |
Add Epics in issuable list when EE10504-single-codebase-ce
Create a method in LabelsHelper which returns the correct
list of `issuable_types` to the view.
| -rw-r--r-- | app/helpers/labels_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/groups/labels/index.html.haml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index a07c3f90a91..e7eb57d21f6 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -276,6 +276,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 5cf3193bc62..5b2cfec979b 100644 --- a/app/views/groups/labels/index.html.haml +++ b/app/views/groups/labels/index.html.haml @@ -1,7 +1,7 @@ - @no_container = true -- page_title "Labels" +- page_title 'Labels' - can_admin_label = can?(current_user, :admin_label, @group) -- issuables = ['issues', 'merge requests'] +- issuables = issuable_types - search = params[:search] - subscribed = params[:subscribed] - labels_or_filters = @labels.exists? || search.present? || subscribed.present? |