Commit ff25cb93 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'feature/repo_size_in_admin' of /home/git/repositories/gitlab/gitlabhq

parents 8a650f5d 44920811
......@@ -137,8 +137,8 @@ module ProjectsHelper
end
end
def repository_size
"#{@project.repository.size} MB"
def repository_size(project = nil)
"#{(project || @project).repository.size} MB"
rescue
# In order to prevent 500 error
# when application cannot allocate memory
......
......@@ -39,6 +39,8 @@
%li
%strong
= link_to project.name_with_namespace, [:admin, project]
%span.label.label-gray
= repository_size(project)
%span.pull-right.light
%span.monospace= project.path_with_namespace + ".git"
......
......@@ -49,6 +49,8 @@
= visibility_level_icon(project.visibility_level)
= link_to project.name_with_namespace, [:admin, project]
.pull-right
%span.label.label-gray
= repository_size(project)
= link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
= link_to 'Destroy', [project], confirm: remove_project_message(project), method: :delete, class: "btn btn-small btn-remove"
- if @projects.blank?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment