diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-07-26 14:51:52 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-07-26 14:51:52 +0800 |
commit | b04f95a2edadd2f84bcecee59bf7001ff6362d00 (patch) | |
tree | 4c6ca2ce730f43668c68bbd11064f1af4cab31f8 /lib/gitlab/lfs/response.rb | |
parent | bd44f1419784ea98ad513f2f2f67ffeb94853c04 (diff) | |
parent | 68162ba900f1b9003fa3d07613333f201be8154a (diff) | |
download | gitlab-ce-b04f95a2edadd2f84bcecee59bf7001ff6362d00.tar.gz |
Merge remote-tracking branch 'upstream/master' into new-issue-by-email
* upstream/master: (620 commits)
Added '*.js.es6 gitlab-language=javascript' to .gitattributes
Fix CI status icon link underline
Update CHANGELOG after 8.10.1
Add CHANGELOG
Add es6 gem
Instrument Nokogiri parsing methods
Fix backup restore
Use project ID in repository cache to prevent stale data from persisting across projects
Add iid to MR API response
`WikiPage` should have a slug even when not persisted.
ES6ify all the things!
Make fork counter always clickable (!5463)
Revert "Merge branch '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…"
Fix CHANGELOG
Add spec for dashes in paths
Fix Error 500 when creating Wiki pages with hyphens or spaces
Add links to the real markdown.md file for all GFM examples
Remove magic comments from Ruby files (!5456)
Ignore invalid trusted proxies in X-Forwarded-For header
remove search_id for label dropdown filter
...
Diffstat (limited to 'lib/gitlab/lfs/response.rb')
-rw-r--r-- | lib/gitlab/lfs/response.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/lfs/response.rb b/lib/gitlab/lfs/response.rb index 811363405a8..a1ee1aa81ff 100644 --- a/lib/gitlab/lfs/response.rb +++ b/lib/gitlab/lfs/response.rb @@ -47,6 +47,8 @@ module Gitlab end def render_storage_upload_store_response(oid, size, tmp_file_name) + return render_forbidden unless tmp_file_name + render_response_to_push do render_lfs_upload_ok(oid, size, tmp_file_name) end |