summaryrefslogtreecommitdiff
path: root/app/controllers/projects/environments_controller.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-11-07 09:43:43 +0100
committerFilipa Lacerda <filipa@gitlab.com>2016-11-16 11:58:06 +0000
commitbd01a5a47c70face953cb2d0a6eb3066abc975fd (patch)
treee03d6ea759b197f42b348264d37ffc804a10faac /app/controllers/projects/environments_controller.rb
parent14345b21509aa874cf8748a2ddcf34d3a632bd6c (diff)
downloadgitlab-ce-bd01a5a47c70face953cb2d0a6eb3066abc975fd.tar.gz
Add EnvironmentSerializer to EnvironmentsController
Diffstat (limited to 'app/controllers/projects/environments_controller.rb')
-rw-r--r--app/controllers/projects/environments_controller.rb19
1 files changed, 3 insertions, 16 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 42f882b55ab..6bd4cb3f2f5 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -13,7 +13,9 @@ class Projects::EnvironmentsController < Projects::ApplicationController
respond_to do |format|
format.html
format.json do
- render json: serialize_as_json(@environments)
+ render json: EnvironmentSerializer
+ .new(project: @project)
+ .represent(@environments)
end
end
end
@@ -63,19 +65,4 @@ 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: {
- user: { only: [:id, :name, :username], methods: [:avatar_url] },
- deployable: { only: [:id, :name, :ref, :tag] }
- },
- methods: [:short_sha, :commit_title, :commit]
- },
- project: { methods: [:namespace] }
- }
- )
- end
end