Commit 6494c6b1 authored by Markus Koller's avatar Markus Koller

Merge branch '281449-feature-flag-enable-environment-auto-stop-start-on-create' into 'master'

Resolve "[Feature flag] Enable environment auto-stop start on create"

See merge request gitlab-org/gitlab!47702
parents 3c7de43e 755fe174
---
title: Begin auto-stop countdown for environment after initial creation
merge_request: 47702
author:
type: changed
---
name: environment_auto_stop_start_on_create
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47239
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281449
milestone: '13.6'
type: development
group: group::release
default_enabled: false
...@@ -24,9 +24,7 @@ module Gitlab ...@@ -24,9 +24,7 @@ module Gitlab
end end
def auto_stop_in def auto_stop_in
if Feature.enabled?(:environment_auto_stop_start_on_create) job.environment_auto_stop_in
job.environment_auto_stop_in
end
end end
def expanded_environment_name def expanded_environment_name
......
...@@ -85,16 +85,6 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Environment do ...@@ -85,16 +85,6 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Environment do
end end
it_behaves_like 'returning a correct environment' it_behaves_like 'returning a correct environment'
context 'but the environment auto_stop_in on create flag is disabled' do
let(:expected_auto_stop_in) { nil }
before do
stub_feature_flags(environment_auto_stop_start_on_create: false)
end
it_behaves_like 'returning a correct environment'
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment