Move the condition to persisted_environment_variables

Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11695?resolved_conflicts=true#note_30797842

Move the condition to persisted_environment_variables
9e60d57d · Lin Jen-Shin · 0e5ee119 · 9e60d57d
Commit 9e60d57d authored May 27, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

build.rb app/models/ci/build.rb +3 -4

No files found.
--- 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