diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-21 15:24:26 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-21 15:24:26 +0000 |
| commit | 39ed04c7b53491ae17713b83cfb8d4c9c4480f9b (patch) | |
| tree | 18031cbbebd7f605e3c625d2edc7c7d8cc69f3f0 | |
| parent | ea64ba1fe34a4439362c0670ecf02490a297a92d (diff) | |
| parent | a9d686b2fbc1b6e158cd2a3ed5f0f3092611f6ce (diff) | |
| download | gitlab-ce-39ed04c7b53491ae17713b83cfb8d4c9c4480f9b.tar.gz | |
Merge branch 'repo-size-link' into 'master'
Link project repo size to files
See merge request !1374
| -rw-r--r-- | app/helpers/projects_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index a2b83c50c2e..7b4747ce3d7 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -156,8 +156,8 @@ module ProjectsHelper end end - def repository_size(project = nil) - "#{(project || @project).repository_size} MB" + def repository_size(project = @project) + "#{project.repository_size} MB" rescue # In order to prevent 500 error # when application cannot allocate memory diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index aa5914e3ed9..6a5fc689803 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -24,7 +24,7 @@ = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag') %li - = link_to namespace_project_path(@project.namespace, @project) do + = link_to project_files_path(@project) do = repository_size - if !prefer_readme? && @repository.readme |