diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2017-07-10 08:10:43 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2017-07-10 08:10:43 -0400 |
| commit | 714dac67fdf3b1443ed7a7a07b7072f0b00bcf47 (patch) | |
| tree | f0a4a429bf691821d87861312505e4fa7c210e31 /app/views/projects/blob | |
| parent | b2afa71d98399f43d184ae4f0fb58eb7fbf0eb1d (diff) | |
| download | gitlab-ce-714dac67fdf3b1443ed7a7a07b7072f0b00bcf47.tar.gz | |
Fixes bugs in implementation and adds new/folder buttons
Diffstat (limited to 'app/views/projects/blob')
| -rw-r--r-- | app/views/projects/blob/_viewer.html.haml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/views/projects/blob/_viewer.html.haml b/app/views/projects/blob/_viewer.html.haml index 7660a5fed75..cc85e5de40f 100644 --- a/app/views/projects/blob/_viewer.html.haml +++ b/app/views/projects/blob/_viewer.html.haml @@ -11,4 +11,10 @@ - else - viewer.prepare! - = render 'projects/tree/tree_content' + -# In the rare case where the first kilobyte of the file looks like text, + -# but the file turns out to actually be binary after loading all data, + -# we fall back on the binary Download viewer. + - viewer = BlobViewer::Download.new(viewer.blob) if viewer.binary_detected_after_load? + + = render viewer.partial_path, viewer: viewer + |