kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Stack rescue blocks for Gitlab::Ci::Config#initialize

This commit is contained in:
Matija Čupić 2018-09-11 16:29:48 +02:00
parent b470f975e1
commit 7600a6469b
No known key found for this signature in database
GPG Key ID: 4BAF84FFACD2E5DE
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/gitlab/ci/config.rb
View File

@ -7,16 +7,14 @@ module Gitlab
ConfigError = Class.new(StandardError)
def initialize(config, opts = {})
begin
@config = Config::Extendable
.new(build_config(config, opts))
.to_hash
@config = Config::Extendable
.new(build_config(config, opts))
.to_hash
@global = Entry::Global.new(@config)
@global.compose!
rescue Loader::FormatError, Extendable::ExtensionError => e
raise Config::ConfigError, e.message
end
@global = Entry::Global.new(@config)
@global.compose!
rescue Loader::FormatError, Extendable::ExtensionError => e
raise Config::ConfigError, e.message
rescue ::Gitlab::Ci::External::Processor::FileError => e
raise ::Gitlab::Ci::YamlProcessor::ValidationError, e.message
end