Add comments to explain some culprit; Add changelog
This commit is contained in:
parent
1a193d042a
commit
df095d7df6
|
@ -192,7 +192,7 @@ module Ci
|
||||||
slugified.gsub(/[^a-z0-9]/, '-')[0..62]
|
slugified.gsub(/[^a-z0-9]/, '-')[0..62]
|
||||||
end
|
end
|
||||||
|
|
||||||
# Variables whose value does not depend on other variables
|
# Variables whose value does not depend on environment
|
||||||
def simple_variables
|
def simple_variables
|
||||||
variables = predefined_variables
|
variables = predefined_variables
|
||||||
variables += project.predefined_variables
|
variables += project.predefined_variables
|
||||||
|
@ -207,7 +207,8 @@ module Ci
|
||||||
variables
|
variables
|
||||||
end
|
end
|
||||||
|
|
||||||
# All variables, including those dependent on other variables
|
# All variables, including those dependent on environment, which could
|
||||||
|
# contain unexpanded variables.
|
||||||
def variables
|
def variables
|
||||||
simple_variables.concat(persisted_environment_variables)
|
simple_variables.concat(persisted_environment_variables)
|
||||||
end
|
end
|
||||||
|
@ -482,6 +483,12 @@ module Ci
|
||||||
variables = persisted_environment.predefined_variables
|
variables = persisted_environment.predefined_variables
|
||||||
|
|
||||||
if url = environment_url
|
if url = environment_url
|
||||||
|
# Note that CI_ENVIRONMENT_URL should be the last variable, because
|
||||||
|
# here we're passing unexpanded environment_url for runner to expand,
|
||||||
|
# and the runner would expand in order. In order to make sure that
|
||||||
|
# CI_ENVIRONMENT_URL has everything available, such as variables
|
||||||
|
# from Environment#predefined_variables, we need to make sure it's
|
||||||
|
# the last variable.
|
||||||
variables << { key: 'CI_ENVIRONMENT_URL', value: url, public: true }
|
variables << { key: 'CI_ENVIRONMENT_URL', value: url, public: true }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Fix passing CI_ENVIRONMENT_NAME and CI_ENVIRONMENT_SLUG for CI_ENVIRONMENT_URL
|
||||||
|
merge_request: 12344
|
||||||
|
author:
|
Loading…
Reference in New Issue