includes last_pipeline

2 files changed, 2 insertions, 4 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 93f28e39f82..b2bc0a17142 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -690,9 +690,7 @@ module API
       expose :id
       expose :description, :ref, :cron, :cron_timezone, :next_run_at, :active
       expose :created_at, :updated_at, :deleted_at
-      expose :last_pipeline, using: Entities::Pipeline do |pipeline_schedule|
-        pipeline_schedule.pipelines&.last
-      end
+      expose :last_pipeline, using: Entities::Pipeline
       expose :owner, using: Entities::UserBasic
     end
 
diff --git a/lib/api/pipeline_schedules.rb b/lib/api/pipeline_schedules.rb
index 58888417888..27be796356c 100644
--- a/lib/api/pipeline_schedules.rb
+++ b/lib/api/pipeline_schedules.rb
@@ -17,7 +17,7 @@ module API
       get ':id/pipeline_schedules' do
         authorize! :read_pipeline_schedule, user_project
 
-        pipeline_schedules = user_project.pipeline_schedules.preload(:pipelines)
+        pipeline_schedules = user_project.pipeline_schedules.includes(last_pipeline: {statuses: :latest})
 
         present paginate(pipeline_schedules), with: Entities::PipelineSchedule
       end