Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 13 insertions, 2 deletions

diff --git a/lib/gitlab/ci/pipeline/seed/environment.rb b/lib/gitlab/ci/pipeline/seed/environment.rb
index 42e8c365824..b20dc383419 100644
--- a/lib/gitlab/ci/pipeline/seed/environment.rb
+++ b/lib/gitlab/ci/pipeline/seed/environment.rb
@@ -12,12 +12,23 @@ module Gitlab
           end
 
           def to_resource
-            job.project.environments
-              .safe_find_or_create_by(name: expanded_environment_name)
+            environments.safe_find_or_create_by(name: expanded_environment_name) do |environment|
+              environment.auto_stop_in = auto_stop_in
+            end
           end
 
           private
 
+          def environments
+            job.project.environments
+          end
+
+          def auto_stop_in
+            if Feature.enabled?(:environment_auto_stop_start_on_create)
+              job.environment_auto_stop_in
+            end
+          end
+
           def expanded_environment_name
             job.expanded_environment_name
           end