Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/graphql/resolvers/ci/config_resolver.rb')
-rw-r--r--app/graphql/resolvers/ci/config_resolver.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/graphql/resolvers/ci/config_resolver.rb b/app/graphql/resolvers/ci/config_resolver.rb
index 72d3ae30d73..852bb47e215 100644
--- a/app/graphql/resolvers/ci/config_resolver.rb
+++ b/app/graphql/resolvers/ci/config_resolver.rb
@@ -29,6 +29,12 @@ module Resolvers
.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 @@ module Resolvers
end
end
- private
-
def make_jobs(config_jobs)
config_jobs.map do |job|
{