Add latest changes from gitlab-org/gitlab@master

lib/banzai/filter/references/issue_reference_filter.rb

@@ -22,7 +22,8 @@ module Banzai
         end
 
         def parent_records(parent, ids)
-          parent.issues.where(iid: ids.to_a).includes(:project, :namespace, :work_item_type)
+          parent.issues.where(iid: ids.to_a)
+                .includes(:project, :namespace, ::Gitlab::Issues::TypeAssociationGetter.call)
         end
 
         def object_link_text_extras(issue, matches)

lib/banzai/filter/references/work_item_reference_filter.rb

@@ -12,7 +12,8 @@ module Banzai
         self.object_class   = WorkItem
 
         def parent_records(parent, ids)
-          parent.work_items.where(iid: ids.to_a).includes(:project, :namespace, :work_item_type)
+          parent.work_items.where(iid: ids.to_a)
+                .includes(:project, :namespace, ::Gitlab::Issues::TypeAssociationGetter.call)
         end
 
         def parent_type

lib/banzai/reference_parser/issue_parser.rb

@@ -68,7 +68,7 @@ module Banzai
 
       def node_includes
         includes = [
-          :work_item_type,
+          ::Gitlab::Issues::TypeAssociationGetter.call,
           :namespace,
           :author,
           :assignees,