From 0fd6206b8f54a122743dc993d31db31bc2ddac5d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 18 Oct 2023 21:11:14 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/merge_requests_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index d57cb0a5926..ad7b7221e44 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -156,7 +156,11 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo pipelines: PipelineSerializer .new(project: @project, current_user: @current_user) .with_pagination(request, response) - .represent(@pipelines, preload: true), + .represent( + @pipelines, + preload: true, + disable_failed_builds: ::Feature.enabled?(:ci_fix_performance_pipelines_json_endpoint, @project) + ), count: { all: @pipelines.count } -- cgit v1.2.3