diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-02-05 13:56:16 +1100 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-02-07 10:09:01 +1100 |
| commit | 66d41d2c22ca949cb1877818b923109c914dffa9 (patch) | |
| tree | 8098786d2caaba7b86565ff1465c780fd3f4d4c4 /app/controllers/ci | |
| parent | cf887a8b3108edb715ee5618377f4ffab1824d85 (diff) | |
| download | gitlab-ce-66d41d2c22ca949cb1877818b923109c914dffa9.tar.gz | |
Handle all YAML parser exceptions in .gitlab-ci.yml (fixes #41209)41209-ci-linter-fails-on-gitlab-ci-blob-viewer
- Move the exception handling as close to the source as possible to
avoid leaking Psych ahstraction
- Also remove unnecessary rescue all statement from LintsController.
This should not be necessary anymore since any YAML errors should all be
caught by the #validation_message method.
Diffstat (limited to 'app/controllers/ci')
| -rw-r--r-- | app/controllers/ci/lints_controller.rb | 5 |
1 files changed, 1 insertions, 4 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 |