From 3d71756b3a002580d5307967aa7522797ff5803e Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Wed, 15 Feb 2023 15:56:10 -0500 Subject: [PATCH] Allow users to stop stale environments via the UI Changelog: added --- .../projects/environments_controller.rb | 3 +-- .../development/stop_stale_environments.yml | 8 ------ .../projects/environments_controller_spec.rb | 26 +++++-------------- 3 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 config/feature_flags/development/stop_stale_environments.yml diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 813e8d7f84d912..9a88a8160b6055 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 ea1484f09702e8..00000000000000 --- 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 48e58cc0e380cc..169fed1ab17188 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 -- GitLab