From b3b8b595a1a7762c5090c92b3247d82d686bbeff Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Thu, 27 Jul 2017 22:41:21 +0900 Subject: [PATCH] Remove if pipeline.variables in Ci::Build#variables --- app/models/ci/build.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index d9029e5fbca..8be2dee6479 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -219,7 +219,7 @@ module Ci variables += project.group.secret_variables_for(ref, project).map(&:to_runner_variable) if project.group variables += secret_variables(environment: environment) variables += trigger_request.user_variables if trigger_request - variables += pipeline.variables.map(&:to_runner_variable) if pipeline.variables + variables += pipeline.variables.map(&:to_runner_variable) variables += pipeline.pipeline_schedule.job_variables if pipeline.pipeline_schedule variables += persisted_environment_variables if environment