diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-07 03:08:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-07 03:08:03 +0000 |
| commit | d8f08f84bd858311bf4af84a98d01c7daf35bfcb (patch) | |
| tree | b57d40e07fa55c664fde9f6d0704f071dc0d73ad | |
| parent | eca8f951a45cd83baab52bebb82f6320d96a4a8d (diff) | |
| download | gitlab-ce-d8f08f84bd858311bf4af84a98d01c7daf35bfcb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | app/models/environment.rb | 10 | ||||
| -rw-r--r-- | config/feature_flags/development/environment_multiple_stop_actions.yml | 8 | ||||
| -rw-r--r-- | spec/models/environment_spec.rb | 13 |
3 files changed, 3 insertions, 28 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb index 9913438df1d..865f5c68af1 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -314,13 +314,9 @@ class Environment < ApplicationRecord def stop_actions strong_memoize(:stop_actions) do - if ::Feature.enabled?(:environment_multiple_stop_actions, project) - # Fix N+1 queries it brings to the serializer. - # Tracked in https://gitlab.com/gitlab-org/gitlab/-/issues/358780 - last_deployment_group.map(&:stop_action).compact - else - [last_deployment&.stop_action].compact - end + # Fix N+1 queries it brings to the serializer. + # Tracked in https://gitlab.com/gitlab-org/gitlab/-/issues/358780 + last_deployment_group.map(&:stop_action).compact end end diff --git a/config/feature_flags/development/environment_multiple_stop_actions.yml b/config/feature_flags/development/environment_multiple_stop_actions.yml deleted file mode 100644 index 514d5e8cf52..00000000000 --- a/config/feature_flags/development/environment_multiple_stop_actions.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: environment_multiple_stop_actions -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84922 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358911 -milestone: '14.10' -type: development -group: group::release -default_enabled: false diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb index 2769e94cef7..34dfc7a1fce 100644 --- a/spec/models/environment_spec.rb +++ b/spec/models/environment_spec.rb @@ -683,19 +683,6 @@ RSpec.describe Environment, :use_clean_rails_memory_store_caching do expect(actions.count).to eq(environment.successful_deployments.count) end end - - context 'when the feature is disabled' do - before do - stub_feature_flags(environment_multiple_stop_actions: false) - end - - it 'returns the last deployment job stop action' do - stop_actions = subject - - expect(stop_actions.first).to eq(close_actions[1]) - expect(stop_actions.count).to eq(1) - end - end end end |