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

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
a30aa411 · Robert Speicher · 6319ca27 · 162f6f53 · a30aa411
Commit a30aa411 authored May 18, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

app/views/projects/tree/_readme.html.haml app/views/projects/tree/_readme.html.haml +8 -7

No files found.
--- a/app/views/projects/tree/_readme.html.haml
+++ b/app/views/projects/tree/_readme.html.haml
-%article.file-holder.readme-holder
+- if readme.rich_viewer
-  .js-file-title.file-title
+  %article.file-holder.readme-holder
-    = blob_icon readme.mode, readme.name
+    .js-file-title.file-title
-    = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@ref, readme.path)) do
+      = blob_icon readme.mode, readme.name
-      %strong
+      = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@ref, readme.path)) do
-        = readme.name
+        %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)
+    = 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)