diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-15 12:36:12 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-15 12:36:12 +0000 |
| commit | 27055005468e587f3ac976de24f858fdc152ff44 (patch) | |
| tree | 4f9591a55329c2156d085bc0a692ddebb36bf13e | |
| parent | e3d818a4e8f51c00aaba1924690f728aa468d7f2 (diff) | |
| parent | 36b54fc04f7619faad37f052528f9cb30c3dd99e (diff) | |
| download | gitlab-ce-27055005468e587f3ac976de24f858fdc152ff44.tar.gz | |
Merge branch 'fix-repository-rescue' into 'master'
Don't crash when project repository doesn't exist.
See merge request !524
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index b0c175bf437..5f577dfc4c5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.10.0 (unreleased) - Allow users to be invited by email to join a group or project. + - 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 |