diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-06-21 18:03:42 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-06-21 18:03:42 +0800 |
| commit | 1a193d042a8bff1e5cfefd103baa8286d8a4c9b5 (patch) | |
| tree | a5cebe3035b95706cf6e89e1bcdd389c9bd82e2d /app/services | |
| parent | 8f537e5c4164f05f1365579d6472b6583c254cbf (diff) | |
| download | gitlab-ce-1a193d042a8bff1e5cfefd103baa8286d8a4c9b5.tar.gz | |
Don't expand CI_ENVIRONMENT_URL so runner would do
And make sure CI_ENVIRONMENT_URL comes last so all
variables would be available whenever the runner is
trying to expand it.
This is an alternative to !12333
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/create_deployment_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/create_deployment_service.rb b/app/services/create_deployment_service.rb index 46823418bb0..fd8781aa48f 100644 --- a/app/services/create_deployment_service.rb +++ b/app/services/create_deployment_service.rb @@ -2,7 +2,7 @@ class CreateDeploymentService attr_reader :job delegate :expanded_environment_name, - :environment_url, + :expanded_environment_url, :project, to: :job @@ -14,7 +14,8 @@ class CreateDeploymentService return unless executable? ActiveRecord::Base.transaction do - environment.external_url = environment_url if environment_url + environment.external_url = expanded_environment_url if + expanded_environment_url environment.fire_state_event(action) return unless environment.save |