diff options
| author | Joshua Lambert <joshua@gitlab.com> | 2017-03-16 18:45:46 +0000 |
|---|---|---|
| committer | Joshua Lambert <joshua@gitlab.com> | 2017-03-16 18:45:46 +0000 |
| commit | d2f209a60b2ea2d889eaf5142c8d09ba0848a4c3 (patch) | |
| tree | 62810ea2d1f8aa1d131e31ad667c39ea0a6d466a /app/models/blob.rb | |
| parent | 83259875939958c6288066a3a4e59a5062b4c9e6 (diff) | |
| parent | ce5d1b6fd7ed1aea2d2a675414ba81be624f2bf1 (diff) | |
| download | gitlab-ce-29142-add-prometheus-integration-documentation.tar.gz | |
Merge branch 'master' into '29142-add-prometheus-integration-documentation'29142-add-prometheus-integration-documentation
# Conflicts:
# doc/install/requirements.md
Diffstat (limited to 'app/models/blob.rb')
| -rw-r--r-- | app/models/blob.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb index ab92e820335..1376b86fdad 100644 --- a/app/models/blob.rb +++ b/app/models/blob.rb @@ -54,9 +54,13 @@ class Blob < SimpleDelegator UploaderHelper::VIDEO_EXT.include?(extname.downcase.delete('.')) end - def to_partial_path + def to_partial_path(project) if lfs_pointer? - 'download' + if project.lfs_enabled? + 'download' + else + 'text' + end elsif image? || svg? 'image' elsif text? |