diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-11-19 20:16:56 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-11-19 20:17:17 +0100 |
| commit | 8248314bc9256d3a0252ad6322df098edca7385a (patch) | |
| tree | 47e52c79d20fcf218ac88aaa93cd7fe77505e3d0 /app/controllers/ci | |
| parent | a5b10196e649b57cf7cc698fe6fb34f73eec47ea (diff) | |
| download | gitlab-ce-8248314bc9256d3a0252ad6322df098edca7385a.tar.gz | |
Don't rescue Exception, but StandardErrorci-yaml-validation
Diffstat (limited to 'app/controllers/ci')
| -rw-r--r-- | app/controllers/ci/lints_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/ci/lints_controller.rb b/app/controllers/ci/lints_controller.rb index 24dd1b5c93a..a4f6aff49b4 100644 --- a/app/controllers/ci/lints_controller.rb +++ b/app/controllers/ci/lints_controller.rb @@ -15,10 +15,10 @@ module Ci @builds = @config_processor.builds @status = true end - rescue Ci::GitlabCiYamlProcessor::ValidationError => e + rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e @error = e.message @status = false - rescue Exception + rescue @error = "Undefined error" @status = false end |