diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 07:23:39 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 07:23:39 +0000 |
| commit | f1f506fcf235eb53f3b4e55bc04ffac5f5e4108c (patch) | |
| tree | 7e6c9a200b95a3d7eda62514275f5b1ec1062808 /app/views | |
| parent | aa0a0dc3318258edb7ee5c2718dc12de73316077 (diff) | |
| parent | 6a6697c393ee84114cf106fae572d1dc973411f8 (diff) | |
| download | gitlab-ce-f1f506fcf235eb53f3b4e55bc04ffac5f5e4108c.tar.gz | |
Merge branch 'add-readme-for-activity-feed-setting' into 'master'
Add README to list of files in project page if activity feed setting in use
Closes #2044
Screenshot:
See merge request !1021
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/show.html.haml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 4577b84ab89..ebbd3e477fc 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -23,18 +23,21 @@ = link_to namespace_project_tags_path(@project.namespace, @project) do = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag') + - if !prefer_readme? && @repository.readme + %li + = link_to 'Readme', readme_path(@project) + - if @repository.changelog %li - = link_to changelog_path(@project) do - Changelog + = link_to 'Changelog', changelog_path(@project) + - if @repository.license %li - = link_to license_path(@project) do - License + = link_to 'License', license_path(@project) + - if @repository.contribution_guide %li - = link_to contribution_guide_path(@project) do - Contribution guide + = link_to 'Contribution guide', contribution_guide_path(@project) - if current_user && can_push_branch?(@project, @project.default_branch) - unless @repository.changelog |