From 20dcd522f0a3cf2603047bcd296eae254487fa5a Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 1 Jun 2017 17:50:10 +0800
Subject: [PATCH] Don't make this change for now to reduce conflicts

---
 app/models/ci/build.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 46822823d62..754b1047644 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -193,15 +193,15 @@ module Ci
     # Variables whose value does not depend on other variables
     def simple_variables
       variables = predefined_variables
-      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(yaml_variables)
-      variables.concat(user_variables)
-      variables.concat(project.secret_variables)
-      variables.concat(trigger_request.user_variables) if trigger_request
+      variables += project.predefined_variables
+      variables += pipeline.predefined_variables
+      variables += runner.predefined_variables if runner
+      variables += project.container_registry_variables
+      variables += project.deployment_variables if has_environment?
+      variables += yaml_variables
+      variables += user_variables
+      variables += project.secret_variables
+      variables += trigger_request.user_variables if trigger_request
       variables
     end