From 7e9c479f7de77702622631cff2628a9c8dcbc627 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Nov 2020 08:27:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-6-stable-ee --- app/services/ci/list_config_variables_service.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/services/ci/list_config_variables_service.rb') 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 -- cgit v1.2.1