Move the condition to persisted_environment_variables
Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11695?resolved_conflicts=true#note_30797842
This commit is contained in:
parent
0e5ee119b7
commit
9e60d57d9f
|
@ -201,10 +201,7 @@ module Ci
|
||||||
|
|
||||||
# All variables, including those dependent on other variables
|
# All variables, including those dependent on other variables
|
||||||
def variables
|
def variables
|
||||||
variables = simple_variables
|
simple_variables.concat(persisted_environment_variables)
|
||||||
variables.concat(persisted_environment_variables) if
|
|
||||||
persisted_environment
|
|
||||||
variables
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def merge_request
|
def merge_request
|
||||||
|
@ -499,6 +496,8 @@ module Ci
|
||||||
end
|
end
|
||||||
|
|
||||||
def persisted_environment_variables
|
def persisted_environment_variables
|
||||||
|
return [] unless persisted_environment
|
||||||
|
|
||||||
variables = persisted_environment.predefined_variables
|
variables = persisted_environment.predefined_variables
|
||||||
|
|
||||||
if environment_url
|
if environment_url
|
||||||
|
|
Loading…
Reference in New Issue