diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-07 16:09:56 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-07 16:09:56 +0300 |
| commit | ead97c55eac773444dee547a934112aa282c2e2e (patch) | |
| tree | b172b648743d3b22af5d2177bf373bd11ddcb098 /lib/gitlab/ci | |
| parent | 2122d7225012b48bad8121e617bc1dbb06f67cf3 (diff) | |
| parent | 1c36766f93180620e4ba4b50bea6908817d01631 (diff) | |
Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master'
Resolve "CI linter fails to work"
Closes #41209
See merge request gitlab-org/gitlab-ce!16922
Diffstat (limited to 'lib/gitlab/ci')
| -rw-r--r-- | lib/gitlab/ci/config/loader.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/yaml_processor.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/loader.rb b/lib/gitlab/ci/config/loader.rb index e7d9f6a7761..141d2714cb6 100644 --- a/lib/gitlab/ci/config/loader.rb +++ b/lib/gitlab/ci/config/loader.rb @@ -6,6 +6,8 @@ module Gitlab def initialize(config) @config = YAML.safe_load(config, [Symbol], [], true) + rescue Psych::Exception => e + raise FormatError, e.message end def valid? diff --git a/lib/gitlab/ci/yaml_processor.rb b/lib/gitlab/ci/yaml_processor.rb index 0bd78b03448..a7285ac8f9d 100644 --- a/lib/gitlab/ci/yaml_processor.rb +++ b/lib/gitlab/ci/yaml_processor.rb @@ -85,7 +85,7 @@ module Gitlab begin Gitlab::Ci::YamlProcessor.new(content) nil - rescue ValidationError, Psych::SyntaxError => e + rescue ValidationError => e e.message end end |