diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-18 18:19:43 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-18 22:45:30 -0500 |
| commit | 8c454b362425228ab14bb4ed5320f6ba2f505679 (patch) | |
| tree | 764f96718fd1efef5ccc3eba458db63b6f1aa8d7 /app/views | |
| parent | ea4d2741a2b574407b0bd387ccd6a8202c014fc5 (diff) | |
| download | gitlab-ce-8c454b362425228ab14bb4ed5320f6ba2f505679.tar.gz | |
Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blob
This allows us to take advantage of Rails' `to_partial_path` to render
the correct partial based on the Blob type, rather than cluttering the
view with conditionals.
It also allows (and will allow in the future) better encapsulation for
Blob-related logic which makes sense for our Rails app but might not
make as much sense for the core `gitlab_git` library, such as detecting
if the blob is an SVG.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/blob/_blob.html.haml | 12 | ||||
| -rw-r--r-- | app/views/projects/blob/_image.html.haml | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml index f3bfe0a18b0..3ffc3fcb7ac 100644 --- a/app/views/projects/blob/_blob.html.haml +++ b/app/views/projects/blob/_blob.html.haml @@ -32,14 +32,4 @@ = number_to_human_size(blob_size(blob)) .file-actions.hidden-xs = render "actions" - - if blob.lfs_pointer? - = render "download", blob: blob - - elsif blob.text? - - if blob_svg?(blob) - = render "image", blob: blob - - else - = render "text", blob: blob - - elsif blob.image? - = render "image", blob: blob - - else - = render "download", blob: blob + = render blob, blob: blob diff --git a/app/views/projects/blob/_image.html.haml b/app/views/projects/blob/_image.html.haml index 113dba5d832..3c11b97921f 100644 --- a/app/views/projects/blob/_image.html.haml +++ b/app/views/projects/blob/_image.html.haml @@ -1,5 +1,5 @@ .file-content.image_file - - if blob_svg?(blob) + - if blob.svg? - # We need to scrub SVG but we cannot do so in the RawController: it would - # be wrong/strange if RawController modified the data. - blob.load_all_data!(@repository) |