diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2015-11-19 18:03:13 -0500 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2015-11-19 18:03:13 -0500 |
| commit | 4865a1370e06341702f324401f7ddb4ea5a203f2 (patch) | |
| tree | cd205807545867a894a8ca2d963cdf9ba7ffb42d /app/models/ci/commit.rb | |
| parent | 431c8df53136ad30a900b1a5d38deac463211bbc (diff) | |
| parent | 0383f84d88d95183638d0e227f3446974eb4e387 (diff) | |
| download | gitlab-ce-todo_system_notes.tar.gz | |
Merge branch 'master' into todo_system_notestodo_system_notes
Diffstat (limited to 'app/models/ci/commit.rb')
| -rw-r--r-- | app/models/ci/commit.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb index 33b57173928..971e899de84 100644 --- a/app/models/ci/commit.rb +++ b/app/models/ci/commit.rb @@ -188,13 +188,13 @@ module Ci end def config_processor + return nil unless ci_yaml_file @config_processor ||= Ci::GitlabCiYamlProcessor.new(ci_yaml_file, gl_project.path_with_namespace) - rescue Ci::GitlabCiYamlProcessor::ValidationError => e + rescue Ci::GitlabCiYamlProcessor::ValidationError, Psych::SyntaxError => e save_yaml_error(e.message) nil - rescue Exception => e - logger.error e.message + "\n" + e.backtrace.join("\n") - save_yaml_error("Undefined yaml error") + rescue + save_yaml_error("Undefined error") nil end |