From 92c25f42009ce42c439efa4236d14ac1440711e4 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 4 May 2016 17:33:58 -0400 Subject: Use `number_to_human_size` helper to show repository size This will intelligently format large repository sizes in GBs (or, shudder, TBs). --- app/helpers/projects_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/helpers/projects_helper.rb') diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 3d5e61d2c18..058233c88ad 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -200,7 +200,8 @@ module ProjectsHelper end def repository_size(project = @project) - "#{project.repository_size} MB" + size_in_bytes = project.repository_size * 1.megabyte + number_to_human_size(size_in_bytes, delimiter: ',', precision: 2) rescue # In order to prevent 500 error # when application cannot allocate memory -- cgit v1.2.1 From 5448970950008fb49092fcfbdb155161d707e10f Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 4 May 2016 17:39:06 -0400 Subject: Remove `rescue` clause from `repository_size` helper The repository size has since become calculated (and cached) more intelligently, and this should no longer be necessary. --- app/helpers/projects_helper.rb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'app/helpers/projects_helper.rb') diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 058233c88ad..20e47f77b48 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -202,11 +202,6 @@ module ProjectsHelper def repository_size(project = @project) size_in_bytes = project.repository_size * 1.megabyte number_to_human_size(size_in_bytes, delimiter: ',', precision: 2) - rescue - # In order to prevent 500 error - # when application cannot allocate memory - # to calculate repo size - just show 'Unknown' - 'unknown' end def default_url_to_repo(project = @project) -- cgit v1.2.1