From 7842bcb613e7d0847ebc1afecbd61421a65663dc Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 18 May 2017 14:53:29 +0000 Subject: Merge branch 'dm-empty-tree-readme' into 'master' Don't blow up when a tree readme is empty and consequently has no rich viewer Closes #32396 See merge request !11459 Conflicts: app/views/projects/tree/_readme.html.haml --- app/views/projects/tree/_readme.html.haml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml index 01599060844..8aa503467ec 100644 --- a/app/views/projects/tree/_readme.html.haml +++ b/app/views/projects/tree/_readme.html.haml @@ -1,3 +1,4 @@ +<<<<<<< HEAD %article.file-holder.readme-holder .js-file-title.file-title = blob_icon readme.mode, readme.name @@ -6,3 +7,14 @@ = readme.name .file-content.wiki = markup(readme.name, readme.data) +======= +- if readme.rich_viewer + %article.file-holder.readme-holder + .js-file-title.file-title + = blob_icon readme.mode, readme.name + = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@ref, readme.path)) do + %strong + = readme.name + + = render 'projects/blob/viewer', viewer: readme.rich_viewer, viewer_url: namespace_project_blob_path(@project.namespace, @project, tree_join(@ref, readme.path), viewer: :rich, format: :json) +>>>>>>> a30aa41... Merge branch 'dm-empty-tree-readme' into 'master' -- cgit v1.2.1