Skip to content
Snippets Groups Projects

Add mergedYaml to CiConfigResolver

Merged Laura Montemayor requested to merge lm-add-merged-yaml into master
1 unresolved thread
Files
3
@@ -29,6 +29,12 @@ def resolve(project_path:, content:, dry_run: false)
.new(project: project, current_user: context[:current_user])
.validate(content, dry_run: dry_run)
response(result).merge(merged_yaml: result.merged_yaml)
end
private
def response(result)
if result.errors.empty?
{
status: :valid,
@@ -43,8 +49,6 @@ def resolve(project_path:, content:, dry_run: false)
end
end
private
def make_jobs(config_jobs)
config_jobs.map do |job|
{
Loading