diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-20 17:12:23 +0200 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-20 17:12:23 +0200 |
commit | e4008bc415c112db6b2200fb9c79431ad4ffbecc (patch) | |
tree | ecedd7a4db93e1cdcebfed0c9afa194fbee30078 /app/views/projects/_readme.html.haml | |
parent | a321404fde85fba6b09cbf1a56914f3a2ae555e4 (diff) | |
parent | befff6827a2cf81f6565b99212652a70139aa2b6 (diff) | |
download | gitlab-ce-e4008bc415c112db6b2200fb9c79431ad4ffbecc.tar.gz |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-improvements-2git-archive-improvements-2
Diffstat (limited to 'app/views/projects/_readme.html.haml')
-rw-r--r-- | app/views/projects/_readme.html.haml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app/views/projects/_readme.html.haml b/app/views/projects/_readme.html.haml index 5bc1999ec9d..0a1cecfdcdf 100644 --- a/app/views/projects/_readme.html.haml +++ b/app/views/projects/_readme.html.haml @@ -1,12 +1,11 @@ - if readme = @repository.readme - %article.readme-holder#README - .clearfix - .pull-right - - - if can?(current_user, :push_code, @project) - = link_to namespace_project_edit_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)), class: 'light' do - %i.fa-align.fa.fa-pencil - .wiki + %article.file-holder.readme-holder + .file-title + = blob_icon readme.mode, readme.name + = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do + %strong + = readme.name + .file-content.wiki = cache(readme_cache_key) do = render_readme(readme) - else |