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
path: root/lib
diff options
context:
space:
mode:
authordrew cimino <dcimino@gitlab.com>2019-04-04 20:24:12 +0300
committerdrew cimino <dcimino@gitlab.com>2019-04-15 19:58:17 +0300
commitb26fd49eb731492e1eda7efddb1e267e1758997c (patch)
treecb500304fa05fa3ff07c44efbeca17483aeacf5f /lib
parent95bbcf082970ae72d3bac814101803e4118db47e (diff)
catching and cleanly reporting SSL errors in Ci::Config::External::Processor
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/config/external/processor.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/external/processor.rb b/lib/gitlab/ci/config/external/processor.rb
index 1dd2d42016a..4a049ecae49 100644
--- a/lib/gitlab/ci/config/external/processor.rb
+++ b/lib/gitlab/ci/config/external/processor.rb
@@ -11,7 +11,8 @@ module Gitlab
@values = values
@external_files = External::Mapper.new(values, project: project, sha: sha, user: user, expandset: expandset).process
@content = {}
- rescue External::Mapper::Error => e
+ rescue External::Mapper::Error,
+ OpenSSL::SSL::SSLError => e
raise IncludeError, e.message
end