diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-17 15:29:42 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-17 15:29:42 -0500 |
commit | 162f6f53630f383cd811c86b02c7c1019e9fa6c9 (patch) | |
tree | 384b08aa4373930a644ff43f00853b828435031b | |
parent | c75f1d3d441443a7effbeba74bdad7348432e299 (diff) | |
download | gitlab-ce-162f6f53630f383cd811c86b02c7c1019e9fa6c9.tar.gz |
Don't blow up when a tree readme is empty and consequently has no rich viewerdm-empty-tree-readme
-rw-r--r-- | app/views/projects/tree/_readme.html.haml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml index 2c2f64283f5..de57cd4ba00 100644 --- a/app/views/projects/tree/_readme.html.haml +++ b/app/views/projects/tree/_readme.html.haml @@ -1,8 +1,9 @@ -%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 +- 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) + = 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) |