Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 11 insertions, 2 deletions

diff --git a/app/models/wiki.rb b/app/models/wiki.rb
index 45747c0b03c..df31c54bd0f 100644
--- a/app/models/wiki.rb
+++ b/app/models/wiki.rb
@@ -159,8 +159,17 @@ class Wiki
     find_page(SIDEBAR, version)
   end
 
-  def find_file(name, version = nil)
-    wiki.file(name, version)
+  def find_file(name, version = 'HEAD', load_content: true)
+    if Feature.enabled?(:gitaly_find_file, user, default_enabled: :yaml)
+      data_limit = load_content ? -1 : 0
+      blobs = repository.blobs_at([[version, name]], blob_size_limit: data_limit)
+
+      return if blobs.empty?
+
+      Gitlab::Git::WikiFile.from_blob(blobs.first)
+    else
+      wiki.file(name, version)
+    end
   end
 
   def create_page(title, content, format = :markdown, message = nil)