Backport CE changesmc/feature/required-template-inclusion-ce

Backports CE changes from
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14011/

1 files changed, 14 insertions, 3 deletions

diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb
index f187e456993..3e03ff52ad2 100644
--- a/lib/gitlab/ci/config.rb
+++ b/lib/gitlab/ci/config.rb
@@ -8,6 +8,12 @@ module Gitlab
     class Config
       ConfigError = Class.new(StandardError)
 
+      RESCUE_ERRORS = [
+        Gitlab::Config::Loader::FormatError,
+        Extendable::ExtensionError,
+        External::Processor::IncludeError
+      ].freeze
+
       def initialize(config, project: nil, sha: nil, user: nil)
         @config = Config::Extendable
           .new(build_config(config, project: project, sha: sha, user: user))
@@ -15,9 +21,7 @@ module Gitlab
 
         @global = Entry::Global.new(@config)
         @global.compose!
-      rescue Gitlab::Config::Loader::FormatError,
-             Extendable::ExtensionError,
-             External::Processor::IncludeError => e
+      rescue *rescue_errors => e
         raise Config::ConfigError, e.message
       end
 
@@ -83,6 +87,13 @@ module Gitlab
           user: user,
           expandset: Set.new).perform
       end
+
+      # Overriden in EE
+      def rescue_errors
+        RESCUE_ERRORS
+      end
     end
   end
 end
+
+Gitlab::Ci::Config.prepend(EE::Gitlab::Ci::Config)