diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-10-18 11:06:32 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-10-18 11:07:32 +0200 |
commit | 2243f0e3deaf0c9557fdc971e566b5606e9e9c52 (patch) | |
tree | d30305d5491849830b5153828f518f2701c9a774 /lib/gitlab/ci/config.rb | |
parent | 5f502c3a82827ebd76e9585e5caa015753016c6a (diff) | |
download | gitlab-ce-2243f0e3deaf0c9557fdc971e566b5606e9e9c52.tar.gz |
Add IncludeError exception and use it in CI config
Diffstat (limited to 'lib/gitlab/ci/config.rb')
-rw-r--r-- | lib/gitlab/ci/config.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb index 7b3c5c12c61..fedaf18ef30 100644 --- a/lib/gitlab/ci/config.rb +++ b/lib/gitlab/ci/config.rb @@ -13,10 +13,10 @@ module Gitlab @global = Entry::Global.new(@config) @global.compose! - rescue Loader::FormatError, Extendable::ExtensionError => e + rescue Loader::FormatError, + Extendable::ExtensionError, + External::Processor::IncludeError => e raise Config::ConfigError, e.message - rescue External::Processor::FileError => e - raise ::Gitlab::Ci::YamlProcessor::ValidationError, e.message end def valid? |