diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-10 11:05:49 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-10 11:05:49 +0300 |
commit | d1ffbdfcb63bbd50573cfda4c59217bb60e76c7e (patch) | |
tree | 2ae7b3d0147aeb6bf0c49bc3d984a38dd30f79b3 | |
parent | bd83991ac7d4f720f81e140ed9a85902d58a5496 (diff) | |
download | gitlab-ce-d1ffbdfcb63bbd50573cfda4c59217bb60e76c7e.tar.gz |
Avoid 500 error on project page when application is close to RAM limit
-rw-r--r-- | app/helpers/projects_helper.rb | 9 | ||||
-rw-r--r-- | app/views/projects/show.html.haml | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 17596b69c7d..d4f1a8f741f 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -131,4 +131,13 @@ module ProjectsHelper "your@email.com" end end + + def repository_size + "#{@project.repository.size} MB" + rescue + # In order to prevent 500 error + # when application cannot allocate memory + # to calculate repo size - just show 'Unknown' + 'unknown' + end end diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 06ca5169dff..aefcd833952 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -17,7 +17,7 @@ %p %p %span.light Repo size is - #{@project.repository.size} MB + = repository_size %p %span.light Created at #{@project.created_at.stamp('Aug 22, 2013')} |