Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-06-05 16:51:31 +0300
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-06-05 16:51:31 +0300
commitda246582db2577107ffdfbcf5741daccc8e029c0 (patch)
tree8b30561289ab8a11576bf5e134d70f3418913f73 /app/controllers
parent809a50fcbf5ecfbf5ec02671f1ca2710a96f58d3 (diff)
parent9921830267ccef2321e9a57383b28daafd34fa78 (diff)
Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'
# Conflicts: # db/schema.rb
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/lfs_storage_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/lfs_storage_controller.rb b/app/controllers/projects/lfs_storage_controller.rb
index 43d8867a536..45c98d60822 100644
--- a/app/controllers/projects/lfs_storage_controller.rb
+++ b/app/controllers/projects/lfs_storage_controller.rb
@@ -18,7 +18,7 @@ class Projects::LfsStorageController < Projects::GitHttpClientController
def upload_authorize
set_workhorse_internal_api_content_type
- authorized = LfsObjectUploader.workhorse_authorize
+ authorized = LfsObjectUploader.workhorse_authorize(has_length: true)
authorized.merge!(LfsOid: oid, LfsSize: size)
render json: authorized