1 files changed, 13 insertions, 6 deletions
diff --git a/lib/gitlab/ci/lint.rb b/lib/gitlab/ci/lint.rb
index 5591ed62436..51743a1f273 100644
--- a/lib/gitlab/ci/lint.rb
+++ b/lib/gitlab/ci/lint.rb
@@ -4,18 +4,23 @@ module Gitlab
   module Ci
     class Lint
       class Result
-        attr_reader :jobs, :merged_yaml, :errors, :warnings
+        attr_reader :jobs, :merged_yaml, :errors, :warnings, :includes
 
-        def initialize(jobs:, merged_yaml:, errors:, warnings:)
+        def initialize(jobs:, merged_yaml:, errors:, warnings:, includes:)
           @jobs = jobs
           @merged_yaml = merged_yaml
           @errors = errors
           @warnings = warnings
+          @includes = includes
         end
 
         def valid?
           @errors.empty?
         end
+
+        def status
+          valid? ? :valid : :invalid
+        end
       end
 
       LOG_MAX_DURATION_THRESHOLD = 2.seconds
@@ -44,9 +49,10 @@ module Gitlab
 
         Result.new(
           jobs: dry_run_convert_to_jobs(pipeline.stages),
-          merged_yaml: pipeline.merged_yaml,
+          merged_yaml: pipeline.config_metadata.try(:[], :merged_yaml),
           errors: pipeline.error_messages.map(&:content),
-          warnings: pipeline.warning_messages(limit: ::Gitlab::Ci::Warnings::MAX_LIMIT).map(&:content)
+          warnings: pipeline.warning_messages(limit: ::Gitlab::Ci::Warnings::MAX_LIMIT).map(&:content),
+          includes: pipeline.config_metadata.try(:[], :includes)
         )
       end
 
@@ -57,9 +63,10 @@ module Gitlab
 
         Result.new(
           jobs: static_validation_convert_to_jobs(result),
-          merged_yaml: result.merged_yaml,
+          merged_yaml: result.config_metadata[:merged_yaml],
           errors: result.errors,
-          warnings: result.warnings.take(::Gitlab::Ci::Warnings::MAX_LIMIT) # rubocop: disable CodeReuse/ActiveRecord
+          warnings: result.warnings.take(::Gitlab::Ci::Warnings::MAX_LIMIT), # rubocop: disable CodeReuse/ActiveRecord
+          includes: result.config_metadata[:includes]
         )
       ensure
         logger.commit(pipeline: ::Ci::Pipeline.new, caller: self.class.name)