summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2017-02-03 12:42:11 +0100
committerRobert Schilling <rschilling@student.tugraz.at>2017-02-03 12:42:11 +0100
commit6e1d675de97122a966b16b7b732b2b145bbfc201 (patch)
tree45d9adc1522fd4fc60361d246b09f1abac80fbdc
parent7dc8b6b2045d84ff232731ef92f2cac916732753 (diff)
downloadgitlab-ce-6e1d675de97122a966b16b7b732b2b145bbfc201.tar.gz
API: Fix file downloading
-rw-r--r--changelogs/unreleased/api-fix-files.yml4
-rw-r--r--lib/api/helpers.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/api-fix-files.yml b/changelogs/unreleased/api-fix-files.yml
new file mode 100644
index 00000000000..8a9e29109a8
--- /dev/null
+++ b/changelogs/unreleased/api-fix-files.yml
@@ -0,0 +1,4 @@
+---
+title: 'API: Fix file downloading'
+merge_request: Robert Schilling
+author: 8267
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index eb5b947172a..dfab60f7fa5 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -304,7 +304,7 @@ module API
header['X-Sendfile'] = path
body
else
- path
+ file path
end
end