summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-14 23:26:53 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-14 23:26:53 +0200
commit36b54fc04f7619faad37f052528f9cb30c3dd99e (patch)
tree3c5df3c20a62f0e8163bf988ef065a05b58f792b
parentac5af61499a8612ef6a51b2bebd18c4c1a083583 (diff)
downloadgitlab-ce-fix-repository-rescue.tar.gz
Don't crash when project repository doesn't exist.fix-repository-rescue
-rw-r--r--CHANGELOG1
-rw-r--r--app/controllers/application_controller.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0ecde5ef89c..b71bb5f491a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 7.10.0 (unreleased)
+ - Don't crash when project repository doesn't exist.
- Fix broken file browsing with a submodule that contains a relative link (Stan Hu)
- Fix persistent XSS vulnerability around profile website URLs.
- Fix project import URL regex to prevent arbitary local repos from being imported.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0521a9ef8cf..920a981e7c9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -126,7 +126,7 @@ class ApplicationController < ActionController::Base
def repository
@repository ||= project.repository
- rescue Grit::NoSuchPathError(e)
+ rescue Grit::NoSuchPathError => e
log_exception(e)
nil
end