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

1 files changed, 8 insertions, 10 deletions

diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb
index 0ffd1791791..fe98d25af29 100644
--- a/lib/gitlab/ci/config.rb
+++ b/lib/gitlab/ci/config.rb
@@ -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
-
-          @global = Entry::Global.new(@config)
-          @global.compose!
-        rescue Loader::FormatError, Extendable::ExtensionError => e
-          raise Config::ConfigError, e.message
-        end
+        @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
       rescue ::Gitlab::Ci::External::Processor::FileError => e
         raise ::Gitlab::Ci::YamlProcessor::ValidationError, e.message
       end