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 /app | |
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 'app')
-rw-r--r-- | app/controllers/ci/lints_controller.rb | 5 | ||||
-rw-r--r-- | app/models/ci/pipeline.rb | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/ci/lints_controller.rb b/app/controllers/ci/lints_controller.rb index be667687c18..e9bd1689a1e 100644 --- a/app/controllers/ci/lints_controller.rb +++ b/app/controllers/ci/lints_controller.rb @@ -16,10 +16,7 @@ module Ci @builds = @config_processor.builds @jobs = @config_processor.jobs end - rescue - @error = 'Undefined error' - @status = false - ensure + render :show end end diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index f84bf132854..2abe90dd181 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -394,7 +394,7 @@ module Ci @config_processor ||= begin Gitlab::Ci::YamlProcessor.new(ci_yaml_file) - rescue Gitlab::Ci::YamlProcessor::ValidationError, Psych::SyntaxError => e + rescue Gitlab::Ci::YamlProcessor::ValidationError => e self.yaml_errors = e.message nil rescue |