1 files changed, 16 insertions, 6 deletions
diff --git a/app/controllers/repositories/lfs_api_controller.rb b/app/controllers/repositories/lfs_api_controller.rb
index 96185608c09..248323a0bb5 100644
--- a/app/controllers/repositories/lfs_api_controller.rb
+++ b/app/controllers/repositories/lfs_api_controller.rb
@@ -92,16 +92,26 @@ module Repositories
       {
         upload: {
           href: "#{project.http_url_to_repo}/gitlab-lfs/objects/#{object[:oid]}/#{object[:size]}",
-          header: {
-            Authorization: authorization_header,
-            # git-lfs v2.5.0 sets the Content-Type based on the uploaded file. This
-            # ensures that Workhorse can intercept the request.
-            'Content-Type': LFS_TRANSFER_CONTENT_TYPE
-          }.compact
+          header: upload_headers
         }
       }
     end
 
+    def upload_headers
+      headers = {
+        Authorization: authorization_header,
+        # git-lfs v2.5.0 sets the Content-Type based on the uploaded file. This
+        # ensures that Workhorse can intercept the request.
+        'Content-Type': LFS_TRANSFER_CONTENT_TYPE
+      }
+
+      if Feature.enabled?(:lfs_chunked_encoding, project, default_enabled: true)
+        headers['Transfer-Encoding'] = 'chunked'
+      end
+
+      headers
+    end
+
     def lfs_check_batch_operation!
       if batch_operation_disallowed?
         render(