diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /app/serializers/environment_serializer.rb | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'app/serializers/environment_serializer.rb')
-rw-r--r-- | app/serializers/environment_serializer.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/serializers/environment_serializer.rb b/app/serializers/environment_serializer.rb index 22839ba3099..46d5a488aea 100644 --- a/app/serializers/environment_serializer.rb +++ b/app/serializers/environment_serializer.rb @@ -43,7 +43,7 @@ class EnvironmentSerializer < BaseSerializer # immediately. items = @paginator.paginate(items) if paginated? - environments = batch_load(resource.where(id: items.map(&:last_id))) + environments = batch_load(Environment.where(id: items.map(&:last_id))) environments_by_id = environments.index_by(&:id) items.map do |item| @@ -52,15 +52,13 @@ class EnvironmentSerializer < BaseSerializer end def batch_load(resource) - temp_deployment_associations = deployment_associations - resource = resource.preload(environment_associations) Preloaders::Environments::DeploymentPreloader.new(resource) - .execute_with_union(:last_deployment, temp_deployment_associations) + .execute_with_union(:last_deployment, deployment_associations) Preloaders::Environments::DeploymentPreloader.new(resource) - .execute_with_union(:upcoming_deployment, temp_deployment_associations) + .execute_with_union(:upcoming_deployment, deployment_associations) resource.to_a.tap do |environments| environments.each do |environment| |