diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-26 09:11:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-26 09:11:51 +0300 |
| commit | 6723a4288d29b11beec2de92fb7cfd682c9dcc50 (patch) | |
| tree | fceffdd19c7b9e628d455c654253f1510e8b512b /app/services/deployments | |
| parent | 26284552f53a281e92a7fcd794f5eafa9bdba02d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/deployments')
| -rw-r--r-- | app/services/deployments/update_environment_service.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/services/deployments/update_environment_service.rb b/app/services/deployments/update_environment_service.rb index b0eb153a7af..9f2c9596fb4 100644 --- a/app/services/deployments/update_environment_service.rb +++ b/app/services/deployments/update_environment_service.rb @@ -58,11 +58,7 @@ module Deployments def expanded_environment_url return unless environment_url - if ::Feature.enabled?(:ci_expand_environment_name_and_url, deployment.project) - ExpandVariables.expand(environment_url, -> { variables.sort_and_expand_all }) - else - ExpandVariables.expand(environment_url, -> { variables }) - end + ExpandVariables.expand(environment_url, -> { variables.sort_and_expand_all }) end def environment_url |