Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 7 insertions, 3 deletions

diff --git a/app/serializers/paginated_diff_entity.rb b/app/serializers/paginated_diff_entity.rb
index a31c9d70d4b..37c48338e55 100644
--- a/app/serializers/paginated_diff_entity.rb
+++ b/app/serializers/paginated_diff_entity.rb
@@ -10,11 +10,9 @@ class PaginatedDiffEntity < Grape::Entity
 
   expose :diff_files do |diffs, options|
     submodule_links = Gitlab::SubmoduleLinks.new(merge_request.project.repository)
-    code_navigation_path =
-      Gitlab::CodeNavigationPath.new(merge_request.project, diffs.diff_refs.head_sha)
 
     DiffFileEntity.represent(diffs.diff_files,
-      options.merge(submodule_links: submodule_links, code_navigation_path: code_navigation_path))
+      options.merge(submodule_links: submodule_links, code_navigation_path: code_navigation_path(diffs)))
   end
 
   expose :pagination do
@@ -38,6 +36,12 @@ class PaginatedDiffEntity < Grape::Entity
 
   private
 
+  def code_navigation_path(diffs)
+    return unless Feature.enabled?(:code_navigation, merge_request.project, default_enabled: true)
+
+    Gitlab::CodeNavigationPath.new(merge_request.project, diffs.diff_refs&.head_sha)
+  end
+
   %i[current_page next_page total_pages].each do |method|
     define_method method do
       pagination_data[method]