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

1 files changed, 9 insertions, 5 deletions

diff --git a/app/serializers/diffs_entity.rb b/app/serializers/diffs_entity.rb
index fb4fbe57130..6ef524b5bec 100644
--- a/app/serializers/diffs_entity.rb
+++ b/app/serializers/diffs_entity.rb
@@ -69,19 +69,17 @@ class DiffsEntity < 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 :merge_request_diffs, using: MergeRequestDiffEntity, if: -> (_, options) { options[:merge_request_diffs]&.any? } do |diffs|
     options[:merge_request_diffs]
   end
 
-  expose :definition_path_prefix, if: -> (diff_file) { Feature.enabled?(:code_navigation, merge_request.project) } do |diffs|
-    project_blob_path(merge_request.project, diffs.diff_refs.head_sha)
+  expose :definition_path_prefix, if: -> (diff_file) { Feature.enabled?(:code_navigation, merge_request.project, default_enabled: true) } do |diffs|
+    project_blob_path(merge_request.project, diffs.diff_refs&.head_sha)
   end
 
   def merge_request
@@ -90,6 +88,12 @@ class DiffsEntity < 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
+
   def commit_ids
     @commit_ids ||= merge_request.recent_commits.map(&:id)
   end