diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2016-10-19 17:03:48 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2016-11-16 11:57:53 +0000 |
commit | 2a40dec16d4690d11417013cab82cd6e2cbdb235 (patch) | |
tree | d967efeace479f239494a172da6ebf4dad0e3ff9 /app/controllers/projects/environments_controller.rb | |
parent | 234c0415e4b1a7584d629d9cc9d8d8d884dc7b6a (diff) | |
download | gitlab-ce-2a40dec16d4690d11417013cab82cd6e2cbdb235.tar.gz |
Serialize all needed data
Diffstat (limited to 'app/controllers/projects/environments_controller.rb')
-rw-r--r-- | app/controllers/projects/environments_controller.rb | 12 |
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 |