Merge remote-tracking branch 'origin/master' into 24147-delete-env-button

2 files changed, 3 insertions, 1 deletions

diff --git a/app/serializers/base_serializer.rb b/app/serializers/base_serializer.rb
index de9a181db90..311ee9c96be 100644
--- a/app/serializers/base_serializer.rb
+++ b/app/serializers/base_serializer.rb
@@ -6,6 +6,7 @@ class BaseSerializer
   def represent(resource, opts = {})
     self.class.entity_class
       .represent(resource, opts.merge(request: @request))
+      .as_json
   end
 
   def self.entity(entity_class)
diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb
index cfa86cc2553..b2de6c5832e 100644
--- a/app/serializers/pipeline_serializer.rb
+++ b/app/serializers/pipeline_serializer.rb
@@ -1,9 +1,10 @@
 class PipelineSerializer < BaseSerializer
-  entity PipelineEntity
   class InvalidResourceError < StandardError; end
   include API::Helpers::Pagination
   Struct.new('Pagination', :request, :response)
 
+  entity PipelineEntity
+
   def represent(resource, opts = {})
     if paginated?
       raise InvalidResourceError unless resource.respond_to?(:page)