Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 2 deletions

diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb
index 82acb5e9d45..cc71ea8e916 100644
--- a/app/finders/todos_finder.rb
+++ b/app/finders/todos_finder.rb
@@ -23,10 +23,16 @@ class TodosFinder
 
   NONE = '0'
 
-  TODO_TYPES = Set.new(%w(Issue MergeRequest Epic)).freeze
+  TODO_TYPES = Set.new(%w(Issue MergeRequest)).freeze
 
   attr_accessor :current_user, :params
 
+  class << self
+    def todo_types
+      TODO_TYPES
+    end
+  end
+
   def initialize(current_user, params = {})
     @current_user = current_user
     @params = params
@@ -124,7 +130,7 @@ class TodosFinder
   end
 
   def type?
-    type.present? && TODO_TYPES.include?(type)
+    type.present? && self.class.todo_types.include?(type)
   end
 
   def type
@@ -201,3 +207,5 @@ class TodosFinder
     end
   end
 end
+
+TodosFinder.prepend_if_ee('EE::TodosFinder')