Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-04-24 22:34:21 +0300
committerPawel Chojnacki <pawel@chojnacki.ws>2017-04-24 22:34:21 +0300
commite057ad975c6ced8c9565fc8329db16b1ababcef8 (patch)
tree75007e98a92c5b2e2a8c27ecf79fedb1980066de /app/controllers/projects/deployments_controller.rb
parente1e0b763dcc98794c6f85ac2adeb4ac0ab9a7e7b (diff)
DeploymentsSerializer can serialize arrays properly
Diffstat (limited to 'app/controllers/projects/deployments_controller.rb')
-rw-r--r--app/controllers/projects/deployments_controller.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb
index a8a6f09d9df..79e59fc1326 100644
--- a/app/controllers/projects/deployments_controller.rb
+++ b/app/controllers/projects/deployments_controller.rb
@@ -1,14 +1,13 @@
class Projects::DeploymentsController < Projects::ApplicationController
+ before_action :authorize_read_environment!
before_action :authorize_read_deployment!
def index
- serializer = DeploymentSerializer.new(user: @current_user, project: project)
-
deployments = environment.deployments.reorder(created_at: :desc)
deployments = deployments.where('created_at > ?', params[:after].to_time) if params[:after]&.to_time
- deployments = deployments.map { |deployment| serializer.represent(deployment) }
- render json: { deployments: deployments }
+ render json: { deployments: DeploymentSerializer.new(user: @current_user, project: project)
+ .represent(deployments) }
end
private