summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-01-16 05:15:52 +0000
committerRémy Coutable <remy@rymai.me>2017-01-16 05:15:52 +0000
commitdaaaf5ef9f182761ac07d76d24d971765134c7e1 (patch)
tree79cbf75550f9dd485a69f39ed7b6e6039eb673b6
parent701a8268f349bdf0e3cf8de704538794e503ee4b (diff)
parent1cccb378316d82ffdf4063b5aa3ecb5146d8fd79 (diff)
downloadgitlab-ce-daaaf5ef9f182761ac07d76d24d971765134c7e1.tar.gz
Merge branch 'fix-deprecation-warning' into 'master'
Fix a API deprecation warning See merge request !8587
-rw-r--r--lib/api/helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 20b5bc1502a..eb2d370c68e 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -294,7 +294,7 @@ module API
header['X-Sendfile'] = path
body
else
- file FileStreamer.new(path)
+ path
end
end