From 9e60d57d9fec420ed2c68d6fe1d3e1af90abb4c5 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Sat, 27 May 2017 04:16:03 +0800
Subject: [PATCH] Move the condition to persisted_environment_variables

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11695?resolved_conflicts=true#note_30797842
---
 app/models/ci/build.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 5e2f8cda356..f77eca7378e 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -201,10 +201,7 @@ module Ci
 
     # All variables, including those dependent on other variables
     def variables
-      variables = simple_variables
-      variables.concat(persisted_environment_variables) if
-        persisted_environment
-      variables
+      simple_variables.concat(persisted_environment_variables)
     end
 
     def merge_request
@@ -499,6 +496,8 @@ module Ci
     end
 
     def persisted_environment_variables
+      return [] unless persisted_environment
+
       variables = persisted_environment.predefined_variables
 
       if environment_url
-- 
GitLab