diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-16 10:32:32 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-16 10:32:32 +0300 |
| commit | 78a50fd30cda9e7f255d2cc0cdbd92a08f77d7c6 (patch) | |
| tree | b09ec953cd2020bac439f132ab537b2d6d3bede3 /lib | |
| parent | 378698475462aa6bf40b14f8593a36a325a6b769 (diff) | |
| parent | b26fd49eb731492e1eda7efddb1e267e1758997c (diff) | |
Merge branch 'ci-lint-ssl-error' into 'master'
Reporting SSL certificate verify errors in CI external config
See merge request gitlab-org/gitlab-ce!26750
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/config/external/processor.rb | 3 |
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 |