Add latest changes from gitlab-org/gitlab@master

4 files changed, 4 insertions, 2 deletions

diff --git a/lib/banzai/filter/references/design_reference_filter.rb b/lib/banzai/filter/references/design_reference_filter.rb
index 01e1036dcec..16a2a2835e9 100644
--- a/lib/banzai/filter/references/design_reference_filter.rb
+++ b/lib/banzai/filter/references/design_reference_filter.rb
@@ -43,7 +43,7 @@ module Banzai
           return [] unless project.design_management_enabled?
 
           iids        = identifiers.map(&:issue_iid).to_set
-          issues      = project.issues.where(iid: iids)
+          issues      = project.issues.where(iid: iids).includes(:project, :namespace)
           id_for_iid  = issues.index_by(&:iid).transform_values(&:id)
           issue_by_id = issues.index_by(&:id)
 
diff --git a/lib/banzai/filter/references/issue_reference_filter.rb b/lib/banzai/filter/references/issue_reference_filter.rb
index b536d900a02..e186c8b1f73 100644
--- a/lib/banzai/filter/references/issue_reference_filter.rb
+++ b/lib/banzai/filter/references/issue_reference_filter.rb
@@ -22,7 +22,7 @@ module Banzai
         end
 
         def parent_records(parent, ids)
-          parent.issues.where(iid: ids.to_a)
+          parent.issues.where(iid: ids.to_a).includes(:project, :namespace)
         end
 
         def object_link_text_extras(issue, matches)
diff --git a/lib/banzai/reference_parser/issue_parser.rb b/lib/banzai/reference_parser/issue_parser.rb
index ecf77191c13..a5862fbaac4 100644
--- a/lib/banzai/reference_parser/issue_parser.rb
+++ b/lib/banzai/reference_parser/issue_parser.rb
@@ -58,6 +58,7 @@ module Banzai
 
       def records_for_nodes(nodes)
         node_includes = [
+          :namespace,
           :author,
           :assignees,
           {
diff --git a/lib/gitlab/github_import/importer/events/cross_referenced.rb b/lib/gitlab/github_import/importer/events/cross_referenced.rb
index b56ae186d3c..4fe371e5900 100644
--- a/lib/gitlab/github_import/importer/events/cross_referenced.rb
+++ b/lib/gitlab/github_import/importer/events/cross_referenced.rb
@@ -55,6 +55,7 @@ module Gitlab
 
             record = record_class.new(id: db_id, iid: iid)
             record.project = project
+            record.namespace = project.project_namespace if record.respond_to?(:namespace)
             record.readonly!
             record
           end