diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-08 18:52:05 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-10 08:21:58 -0500 |
commit | 00fc9f260706cfd6d6f4261eea24eb3ff455b3e0 (patch) | |
tree | c09dc1e2fccd2a4b5e0cce613465ec367133a5dd /app/views/projects/_readme.html.haml | |
parent | ecc6cc8be75b5c66fdf7f5595b71aabf9366a5e1 (diff) | |
download | gitlab-ce-00fc9f260706cfd6d6f4261eea24eb3ff455b3e0.tar.gz |
Load tree readme asynchronouslydm-async-tree-readme
Diffstat (limited to 'app/views/projects/_readme.html.haml')
-rw-r--r-- | app/views/projects/_readme.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/_readme.html.haml b/app/views/projects/_readme.html.haml index c0d12cbc66e..cf09d9db6b7 100644 --- a/app/views/projects/_readme.html.haml +++ b/app/views/projects/_readme.html.haml @@ -2,9 +2,9 @@ %article.readme-holder .pull-right - if can?(current_user, :push_code, @project) - = link_to icon('pencil'), namespace_project_edit_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)), class: 'light edit-project-readme' - .file-content.wiki - = markup(readme.name, readme.data, rendered: @repository.rendered_readme) + = link_to icon('pencil'), namespace_project_edit_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.path)), class: 'light edit-project-readme' + + = render 'projects/blob/viewer', viewer: readme.rich_viewer, viewer_url: namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.path), viewer: :rich, format: :json) - else .row-content-block.second-block.center %h3.page-title |