diff options
| author | James Lopez <james@jameslopez.es> | 2016-03-21 18:52:55 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-03-21 18:52:55 +0100 |
| commit | cae864a12e3c99d642fb812fff3941e9f5271f95 (patch) | |
| tree | fce4b24fc294e9566a56027dcb327805d6a01ae7 /app/controllers/projects/raw_controller.rb | |
| parent | 4196ee0661d705c81ca49294926bfaa28d725119 (diff) | |
| parent | 2bcbc7c6db934d56448c4c261861e62982b9b573 (diff) | |
| download | gitlab-ce-cae864a12e3c99d642fb812fff3941e9f5271f95.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/safe-import-url
Diffstat (limited to 'app/controllers/projects/raw_controller.rb')
| -rw-r--r-- | app/controllers/projects/raw_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb index d9723acb1d9..10de0e60530 100644 --- a/app/controllers/projects/raw_controller.rb +++ b/app/controllers/projects/raw_controller.rb @@ -13,6 +13,8 @@ class Projects::RawController < Projects::ApplicationController if @blob headers['X-Content-Type-Options'] = 'nosniff' + return if cached_blob? + if @blob.lfs_pointer? send_lfs_object else |