diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/graphql/resolvers/ci | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) | |
download | gitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/graphql/resolvers/ci')
-rw-r--r-- | app/graphql/resolvers/ci/config_resolver.rb | 8 |
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| { |