Serialize all needed data

1 files changed, 11 insertions, 1 deletions

diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 9255388eb84..e937e6b950b 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -19,7 +19,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     respond_to do |format|
       format.html
       format.json do
-        render json: @environments
+        render json: serialize_as_json(@environments)
       end
     end
   end
@@ -69,4 +69,14 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   def environment
     @environment ||= project.environments.find(params[:id])
   end
+  
+  def serialize_as_json(resource)
+    resource.as_json(
+      include: {
+        last_deployment: { 
+          include: [:deployable, :user]
+        }
+      }
+    )
+  end
 end