Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2018-02-05 05:56:16 +0300
committerDylan Griffith <dyl.griffith@gmail.com>2018-02-07 02:09:01 +0300
commit66d41d2c22ca949cb1877818b923109c914dffa9 (patch)
tree8098786d2caaba7b86565ff1465c780fd3f4d4c4 /app/controllers
parentcf887a8b3108edb715ee5618377f4ffab1824d85 (diff)
Handle all YAML parser exceptions in .gitlab-ci.yml (fixes #41209)
- 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')
-rw-r--r--app/controllers/ci/lints_controller.rb5
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