Don't make this change for now to reduce conflicts

20dcd522 · Lin Jen-Shin · 99b142bc · 20dcd522
Commit 20dcd522 authored Jun 01, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

app/models/ci/build.rb app/models/ci/build.rb +9 -9

No files found.
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -193,15 +193,15 @@ def ref_slug
    # 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