1 files changed, 38 insertions, 6 deletions

diff --git a/lib/gitlab/ci/config/yaml.rb b/lib/gitlab/ci/config/yaml.rb
index 94ef0afe7f9..d1b1b8caa5c 100644
--- a/lib/gitlab/ci/config/yaml.rb
+++ b/lib/gitlab/ci/config/yaml.rb
@@ -7,23 +7,38 @@ module Gitlab
         AVAILABLE_TAGS = [Config::Yaml::Tags::Reference].freeze
         MAX_DOCUMENTS = 2
 
-        class << self
-          def load!(content)
+        class Loader
+          def initialize(content, project: nil)
+            @content = content
+            @project = project
+          end
+
+          def load!
             ensure_custom_tags
 
-            if ::Feature.enabled?(:ci_multi_doc_yaml)
-              Gitlab::Config::Loader::MultiDocYaml.new(
+            if project.present? && ::Feature.enabled?(:ci_multi_doc_yaml, project)
+              ::Gitlab::Config::Loader::MultiDocYaml.new(
                 content,
                 max_documents: MAX_DOCUMENTS,
                 additional_permitted_classes: AVAILABLE_TAGS
-              ).load!.first
+              ).load!
             else
-              Gitlab::Config::Loader::Yaml.new(content, additional_permitted_classes: AVAILABLE_TAGS).load!
+              ::Gitlab::Config::Loader::Yaml
+                .new(content, additional_permitted_classes: AVAILABLE_TAGS)
+                .load!
             end
           end
 
+          def to_result
+            Yaml::Result.new(config: load!, error: nil)
+          rescue ::Gitlab::Config::Loader::FormatError => e
+            Yaml::Result.new(error: e)
+          end
+
           private
 
+          attr_reader :content, :project
+
           def ensure_custom_tags
             @ensure_custom_tags ||= begin
               AVAILABLE_TAGS.each { |klass| Psych.add_tag(klass.tag, klass) }
@@ -32,6 +47,23 @@ module Gitlab
             end
           end
         end
+
+        class << self
+          def load!(content, project: nil)
+            Loader.new(content, project: project).to_result.then do |result|
+              ##
+              # raise an error for backwards compatibility
+              #
+              raise result.error unless result.valid?
+
+              result.content
+            end
+          end
+
+          def load_result!(content, project: nil)
+            Loader.new(content, project: project).to_result
+          end
+        end
       end
     end
   end