diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-05-04 18:51:18 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-05-04 18:51:18 -0500 |
| commit | 7fd42698aae14c8d0a064716f90274f1de54e496 (patch) | |
| tree | 552d6f47cde2ab29571b09fdc5a97c3b1dc70ee6 /app/controllers/projects/raw_controller.rb | |
| parent | b396668ec55fb866ef578e5f0e60df8b13519613 (diff) | |
| parent | bacf652a3794c4da71312982b7617542363c1441 (diff) | |
| download | gitlab-ce-7fd42698aae14c8d0a064716f90274f1de54e496.tar.gz | |
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Conflicts:
lib/gitlab/cycle_analytics/review_stage.rb
lib/gitlab/cycle_analytics/staging_stage.rb
lib/gitlab/cycle_analytics/test_stage.rb
Diffstat (limited to 'app/controllers/projects/raw_controller.rb')
| -rw-r--r-- | app/controllers/projects/raw_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb index a0b08ad130f..a02cc477e08 100644 --- a/app/controllers/projects/raw_controller.rb +++ b/app/controllers/projects/raw_controller.rb @@ -15,7 +15,7 @@ class Projects::RawController < Projects::ApplicationController return if cached_blob? - if @blob.valid_lfs_pointer? + if @blob.stored_externally? send_lfs_object else send_git_blob @repository, @blob |