diff options
author | Stan Hu <stanhu@gmail.com> | 2015-07-21 18:30:27 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-08-10 07:31:57 -0700 |
commit | 6a6697c393ee84114cf106fae572d1dc973411f8 (patch) | |
tree | 5551c23a6530a2652b04785c31045ee57c2ce674 /app/helpers/projects_helper.rb | |
parent | 77f37fa9094443abe8e60ebd09a82e94d0a0047b (diff) | |
download | gitlab-ce-6a6697c393ee84114cf106fae572d1dc973411f8.tar.gz |
Add README to list of files in project page if activity feed setting in use
Closes #2044
Diffstat (limited to 'app/helpers/projects_helper.rb')
-rw-r--r-- | app/helpers/projects_helper.rb | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 525a46291f6..ab9b068de05 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -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 |