Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 0 deletions

diff --git a/app/graphql/resolvers/work_items/types_resolver.rb b/app/graphql/resolvers/work_items/types_resolver.rb
new file mode 100644
index 00000000000..bacb78fd0e4
--- /dev/null
+++ b/app/graphql/resolvers/work_items/types_resolver.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module WorkItems
+    class TypesResolver < BaseResolver
+      type Types::WorkItems::TypeType.connection_type, null: true
+
+      def resolve
+        # This will require a finder in the future when groups get their work item types
+        # All groups use the default types for now
+        ::WorkItems::Type.default.order_by_name_asc
+      end
+    end
+  end
+end