diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
| commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
| tree | 544930fb309b30317ae9797a9683768705d664c4 /lib/gitlab/ci/pipeline/seed/environment.rb | |
| parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
| download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'lib/gitlab/ci/pipeline/seed/environment.rb')
| -rw-r--r-- | lib/gitlab/ci/pipeline/seed/environment.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/ci/pipeline/seed/environment.rb b/lib/gitlab/ci/pipeline/seed/environment.rb index b20dc383419..5dff0788ec9 100644 --- a/lib/gitlab/ci/pipeline/seed/environment.rb +++ b/lib/gitlab/ci/pipeline/seed/environment.rb @@ -24,9 +24,7 @@ module Gitlab end def auto_stop_in - if Feature.enabled?(:environment_auto_stop_start_on_create) - job.environment_auto_stop_in - end + job.environment_auto_stop_in end def expanded_environment_name |