Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index f274406e225..20320d1b7ae 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -29,14 +29,13 @@ module API
           not_found!
         end
 
-        def assign_blob_vars!
+        def assign_blob_vars!(limit:)
           authorize! :download_code, user_project
 
           @repo = user_project.repository
 
           begin
-            @blob = Gitlab::Git::Blob.raw(@repo, params[:sha])
-            @blob.load_all_data!(@repo)
+            @blob = Gitlab::Git::Blob.raw(@repo, params[:sha], limit: limit)
           rescue StandardError
             not_found! 'Blob'
           end
@@ -55,7 +54,7 @@ module API
         use :pagination
       end
       get ':id/repository/tree' do
-        ref = params[:ref] || user_project.try(:default_branch) || 'master'
+        ref = params[:ref] || user_project.default_branch
         path = params[:path] || nil
 
         commit = user_project.commit(ref)
@@ -71,7 +70,8 @@ module API
         requires :sha, type: String, desc: 'The commit hash'
       end
       get ':id/repository/blobs/:sha/raw' do
-        assign_blob_vars!
+        # Load metadata enough to ask Workhorse to load the whole blob
+        assign_blob_vars!(limit: 0)
 
         no_cache_headers
 
@@ -83,7 +83,7 @@ module API
         requires :sha, type: String, desc: 'The commit hash'
       end
       get ':id/repository/blobs/:sha' do
-        assign_blob_vars!
+        assign_blob_vars!(limit: -1)
 
         {
           size: @blob.size,