summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-10-23 11:29:47 +0300
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-10-23 11:29:47 +0300
commitb2df61d85ab295a9ba4585f667537a9afc3efc6a (patch)
tree9a03faeb2668521e949b3708bcaa347d2977ac6d
parent9902f1af6edc0b6c0a935fb3578715d20636d76e (diff)
downloadgitlab-ce-b2df61d85ab295a9ba4585f667537a9afc3efc6a.tar.gz
Fix 500 error on admin project if empty
-rw-r--r--app/roles/repository.rb2
-rw-r--r--app/views/admin/projects/show.html.haml2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/roles/repository.rb b/app/roles/repository.rb
index 882ec31033c..8942eaea754 100644
--- a/app/roles/repository.rb
+++ b/app/roles/repository.rb
@@ -137,6 +137,8 @@ module Repository
def has_commits?
!!commit
+ rescue Grit::NoSuchPathError
+ false
end
def root_ref
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index f85b6e4b865..c742fb3365a 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -5,7 +5,7 @@
%i.icon-edit
Edit
-- if !@admin_project.has_post_receive_file? && @admin_project.commit
+- if !@admin_project.has_post_receive_file? && @admin_project.has_commits?
%br
.alert.alert-error
%span