diff options
Diffstat (limited to 'app/models/ci/build.rb')
-rw-r--r-- | app/models/ci/build.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index d4b5d964846..a3a289c3a12 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -257,12 +257,10 @@ module Ci variables.concat(project.predefined_variables) variables.concat(pipeline.predefined_variables) variables.concat(runner.predefined_variables) if runner - variables.concat(project.container_registry_variables) variables.concat(project.deployment_variables) if has_environment? - variables.concat(project.auto_devops_variables) variables.concat(yaml_variables) variables.concat(user_variables) - variables.concat(project.group.secret_variables_for(ref, project).map(&:to_runner_variable)) if project.group + variables.concat(project.group.secret_variables_for(ref, project)) if project.group variables.concat(secret_variables(environment: environment)) variables.concat(trigger_request.user_variables) if trigger_request variables.concat(pipeline.variables) |