diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 813e8d7f84d912a7fc0b55db8f4d823f2f84247b..9a88a8160b6055c371fda6d0b2e7545bf2cbc0ef 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -58,8 +58,7 @@ def index render json: { environments: serialize_environments(request, response, params[:nested]), review_app: serialize_review_app, - can_stop_stale_environments: Feature.enabled?(:stop_stale_environments, @project) && - can?(current_user, :stop_environment, @project), + can_stop_stale_environments: can?(current_user, :stop_environment, @project), available_count: environments_count_by_state[:available], stopped_count: environments_count_by_state[:stopped] } diff --git a/config/feature_flags/development/stop_stale_environments.yml b/config/feature_flags/development/stop_stale_environments.yml deleted file mode 100644 index ea1484f09702e8fa44c407604d498ca1162948a4..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/stop_stale_environments.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: stop_stale_environments -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108616 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/387820 -milestone: '15.8' -type: development -group: group::release -default_enabled: false diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index 48e58cc0e380cc03937dc009837ac928993421ce..169fed1ab171886660b58a4f2c5e5713fa221fe7 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -104,30 +104,16 @@ end context 'can access stop stale environments feature' do - context 'when stop_stale_environments FF is enabled' do - it 'maintainers can access the feature' do - get :index, params: environment_params(format: :json) - - expect(json_response['can_stop_stale_environments']).to be_truthy - end - - context 'when user is a reporter' do - let(:user) { reporter } + it 'maintainers can access the feature' do + get :index, params: environment_params(format: :json) - it 'reporters cannot access the feature' do - get :index, params: environment_params(format: :json) - - expect(json_response['can_stop_stale_environments']).to be_falsey - end - end + expect(json_response['can_stop_stale_environments']).to be_truthy end - context 'when stop_stale_environments FF is disabled' do - before do - stub_feature_flags(stop_stale_environments: false) - end + context 'when user is a reporter' do + let(:user) { reporter } - it 'maintainers cannot access the feature' do + it 'reporters cannot access the feature' do get :index, params: environment_params(format: :json) expect(json_response['can_stop_stale_environments']).to be_falsey