Commit 7eb91eea authored by Jan Provaznik's avatar Jan Provaznik

Merge branch '33187-fix-filter-todos-by-design' into 'master'

Fix filter todos by design

See merge request gitlab-org/gitlab!29972
parents 753f1b8c 315a5e70
......@@ -137,7 +137,7 @@ There are four kinds of filters you can use on your To-Do List.
| Project | Filter by project |
| Group | Filter by group |
| Author | Filter by the author that triggered the To Do |
| Type | Filter by issue, merge request, or epic **(ULTIMATE)** |
| Type | Filter by issue, merge request, design, or epic **(ULTIMATE)** |
| Action | Filter by the action that triggered the To Do |
You can also filter by more than one of these at the same time. The possible Actions are
......
......@@ -4,7 +4,7 @@ module EE
module TodosFinder
extend ActiveSupport::Concern
EE_TODO_TYPES = (::TodosFinder::TODO_TYPES + %w[Epic]).freeze
EE_TODO_TYPES = (::TodosFinder::TODO_TYPES + %w[Epic DesignManagement::Design]).freeze
class_methods do
extend ::Gitlab::Utils::Override
......
---
title: Fix filter todos by design.
merge_request: 29972
author: Gilang Gumilar
type: fixed
......@@ -260,7 +260,7 @@ describe TodosFinder do
it 'returns the expected types' do
expected_result =
if Gitlab.ee?
%w[Epic Issue MergeRequest]
%w[DesignManagement::Design Epic Issue MergeRequest]
else
%w[Issue MergeRequest]
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment