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

1 files changed, 6 insertions, 1 deletions

diff --git a/app/controllers/repositories/lfs_api_controller.rb b/app/controllers/repositories/lfs_api_controller.rb
index 248323a0bb5..9b7cbcb2dfe 100644
--- a/app/controllers/repositories/lfs_api_controller.rb
+++ b/app/controllers/repositories/lfs_api_controller.rb
@@ -91,12 +91,17 @@ module Repositories
     def upload_actions(object)
       {
         upload: {
-          href: "#{project.http_url_to_repo}/gitlab-lfs/objects/#{object[:oid]}/#{object[:size]}",
+          href: "#{upload_http_url_to_repo}/gitlab-lfs/objects/#{object[:oid]}/#{object[:size]}",
           header: upload_headers
         }
       }
     end
 
+    # Overridden in EE
+    def upload_http_url_to_repo
+      project.http_url_to_repo
+    end
+
     def upload_headers
       headers = {
         Authorization: authorization_header,