diff options
| author | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2017-03-17 17:04:51 +0000 |
|---|---|---|
| committer | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2017-03-17 17:04:51 +0000 |
| commit | b6bab6ce47813c67ea1e2c7d4fde7d9e320da99c (patch) | |
| tree | 6c1b7db2aeebc5756c73842cffef22df655cc820 /app/models/blob.rb | |
| parent | 116efdaf128ddcccc30fb82615cd964b35cacc53 (diff) | |
| parent | bb1620aaf712c22c61fda098260f481ad79a05e2 (diff) | |
| download | gitlab-ce-focus-mode-board.tar.gz | |
Merge branch 'master' into 'focus-mode-board'focus-mode-board
# Conflicts:
# app/views/shared/issuable/_filter.html.haml
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? |