Add README to list of files in project page if activity feed setting in use
Closes #2044
This commit is contained in:
parent
77f37fa909
commit
6a6697c393
2 changed files with 29 additions and 30 deletions
|
@ -231,37 +231,20 @@ module ProjectsHelper
|
|||
end
|
||||
end
|
||||
|
||||
def readme_path(project)
|
||||
filename_path(project, :readme)
|
||||
end
|
||||
|
||||
def changelog_path(project)
|
||||
if project && changelog = project.repository.changelog
|
||||
namespace_project_blob_path(
|
||||
project.namespace,
|
||||
project,
|
||||
tree_join(project.default_branch,
|
||||
changelog.name)
|
||||
)
|
||||
end
|
||||
filename_path(project, :changelog)
|
||||
end
|
||||
|
||||
def license_path(project)
|
||||
if project && license = project.repository.license
|
||||
namespace_project_blob_path(
|
||||
project.namespace,
|
||||
project,
|
||||
tree_join(project.default_branch,
|
||||
license.name)
|
||||
)
|
||||
end
|
||||
filename_path(project, :license)
|
||||
end
|
||||
|
||||
def version_path(project)
|
||||
if project && version = project.repository.version
|
||||
namespace_project_blob_path(
|
||||
project.namespace,
|
||||
project,
|
||||
tree_join(project.default_branch,
|
||||
version.name)
|
||||
)
|
||||
end
|
||||
filename_path(project, :version)
|
||||
end
|
||||
|
||||
def hidden_pass_url(original_url)
|
||||
|
@ -331,4 +314,17 @@ module ProjectsHelper
|
|||
count
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def filename_path(project, filename)
|
||||
if project && blob = project.repository.send(filename)
|
||||
namespace_project_blob_path(
|
||||
project.namespace,
|
||||
project,
|
||||
tree_join(project.default_branch,
|
||||
blob.name)
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue