diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-21 18:10:08 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-21 18:10:08 +0000 |
commit | 5d41ea8c8e83ff6054ba4303ec8dc9bc33556602 (patch) | |
tree | f69079c9fac34f1e5e785d1f18d2f9ad339e4cbc /app/models/environment.rb | |
parent | a09c6d7e91de9abab7e2ea8dffce1cbb89bf95d8 (diff) | |
download | gitlab-ce-5d41ea8c8e83ff6054ba4303ec8dc9bc33556602.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/environment.rb')
-rw-r--r-- | app/models/environment.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb index f7becf1f700..b93f1158a90 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -331,11 +331,7 @@ class Environment < ApplicationRecord end def last_deployment_group - if ::Feature.enabled?(:batch_load_environment_last_deployment_group, project) - Deployment.last_deployment_group_for_environment(self) - else - legacy_last_deployment_group - end + Deployment.last_deployment_group_for_environment(self) end def reset_auto_stop |