summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMicaël Bergeron <mbergeron@gitlab.com>2018-03-22 14:37:47 -0400
committerMicaël Bergeron <mbergeron@gitlab.com>2018-03-22 14:37:47 -0400
commitb08a1cd2c406919491f8a91e51aa0034762df14e (patch)
treea86a9ffd254deab1374aaad82fb58dcdee997ab0 /app
parent764b5fdd162d159bc6d8fb81adf71e32f5901de1 (diff)
downloadgitlab-ce-b08a1cd2c406919491f8a91e51aa0034762df14e.tar.gz
fix the failing specs
Diffstat (limited to 'app')
-rw-r--r--app/controllers/concerns/send_file_upload.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/concerns/send_file_upload.rb b/app/controllers/concerns/send_file_upload.rb
index e8636ab7901..55011c89886 100644
--- a/app/controllers/concerns/send_file_upload.rb
+++ b/app/controllers/concerns/send_file_upload.rb
@@ -8,7 +8,8 @@ module SendFileUpload
if file_upload.file_storage?
send_file file_upload.path, send_params
elsif file_upload.class.proxy_download_enabled?
- Gitlab::Workhorse.send_url(file_upload.url(**redirect_params))
+ headers.store(*Gitlab::Workhorse.send_url(file_upload.url(**redirect_params)))
+ head :ok
else
redirect_to file_upload.url(**redirect_params)
end