diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-26 09:11:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-26 09:11:51 +0300 |
| commit | 6723a4288d29b11beec2de92fb7cfd682c9dcc50 (patch) | |
| tree | fceffdd19c7b9e628d455c654253f1510e8b512b /app/serializers | |
| parent | 26284552f53a281e92a7fcd794f5eafa9bdba02d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/environment_serializer.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/serializers/environment_serializer.rb b/app/serializers/environment_serializer.rb index beee5522a06..c73b1ad6073 100644 --- a/app/serializers/environment_serializer.rb +++ b/app/serializers/environment_serializer.rb @@ -54,7 +54,7 @@ class EnvironmentSerializer < BaseSerializer def batch_load(resource) temp_deployment_associations = deployment_associations - resource = resource.preload(environment_associations.except(:last_deployment, :upcoming_deployment)) + resource = resource.preload(environment_associations) Preloaders::Environments::DeploymentPreloader.new(resource) .execute_with_union(:last_deployment, temp_deployment_associations) @@ -76,8 +76,6 @@ class EnvironmentSerializer < BaseSerializer def environment_associations { - last_deployment: deployment_associations, - upcoming_deployment: deployment_associations, project: project_associations } end |