diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index b26f3edeab5615f32d17b7ec563d6a0daacca359..84451257b98f898946e27f68af46b40ad3f9df9f 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -12,7 +12,6 @@ class Projects::PipelinesController < Projects::ApplicationController .execute(scope: @scope) .page(params[:page]) .per(30) - .includes(project: :namespace) @running_or_pending_count = PipelinesFinder .new(project).execute(scope: 'running').count diff --git a/app/finders/pipelines_finder.rb b/app/finders/pipelines_finder.rb index af4bb54e52d9f63bf6aff98334a52f0b97e66a91..32aea75486deee72a465d8f5959a772d1787df79 100644 --- a/app/finders/pipelines_finder.rb +++ b/app/finders/pipelines_finder.rb @@ -20,7 +20,6 @@ class PipelinesFinder end scoped_pipelines.order(id: :desc) - .includes(project: [:namespace]) end private diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index 2de34758f1fea4c7176c6cd344b06afa67dde101..0d14858ce53c57e1e0829a2e86e1c538c3c69ca5 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -5,6 +5,8 @@ class PipelineSerializer < BaseSerializer Struct.new('Pagination', :request, :response) def represent(resource, opts = {}) + resource = resource.includes(project: :namespace) + if paginated? raise InvalidResourceError unless resource.respond_to?(:page)