diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/services/ci/list_config_variables_service.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-0bddc398e06691ecd2db73d0c570a122a6585fe8.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/services/ci/list_config_variables_service.rb')
-rw-r--r-- | app/services/ci/list_config_variables_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/ci/list_config_variables_service.rb b/app/services/ci/list_config_variables_service.rb index b5dc192b512..4a5b3a92a2c 100644 --- a/app/services/ci/list_config_variables_service.rb +++ b/app/services/ci/list_config_variables_service.rb @@ -6,7 +6,10 @@ module Ci config = project.ci_config_for(sha) return {} unless config - result = Gitlab::Ci::YamlProcessor.new(config).execute + result = Gitlab::Ci::YamlProcessor.new(config, project: project, + user: current_user, + sha: sha).execute + result.valid? ? result.variables_with_data : {} end end |