diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-18 07:30:11 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-18 07:30:11 +0000 |
| commit | c9e61fa3cd8eeb63aced9a55039dc4d17616cd42 (patch) | |
| tree | 5cacc30a4e206f678263d9f2be4c759879de0aab /app/views/projects/blob/_blob.html.haml | |
| parent | 0b946a7bc69058a952a558a9530cd3e8302361e7 (diff) | |
| parent | 82c2296a1274b6e7c3bb3031a7e903c01bc8a3c4 (diff) | |
| download | gitlab-ce-c9e61fa3cd8eeb63aced9a55039dc4d17616cd42.tar.gz | |
Merge branch 'dm-readme-viewer' into 'master'
Add auxiliary blob viewer for README
See merge request !11366
Diffstat (limited to 'app/views/projects/blob/_blob.html.haml')
| -rw-r--r-- | app/views/projects/blob/_blob.html.haml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml index c90a7440480..8bd336269ff 100644 --- a/app/views/projects/blob/_blob.html.haml +++ b/app/views/projects/blob/_blob.html.haml @@ -5,10 +5,7 @@ %ul.blob-commit-info = render 'projects/commits/commit', commit: @last_commit, project: @project, ref: @ref - - auxiliary_viewer = blob.auxiliary_viewer - - if auxiliary_viewer && !auxiliary_viewer.render_error - .well-segment.blob-auxiliary-viewer - = render 'projects/blob/viewer', viewer: auxiliary_viewer + = render "projects/blob/auxiliary_viewer", blob: blob #blob-content-holder.blob-content-holder %article.file-holder |