Merge branch 'enforce-current-user-usage-on-entities' into 'master'

Make all Serializers receive `current_user` instead `user` [CE] See merge request !11254

Merge branch 'enforce-current-user-usage-on-entities' into 'master'
bae0a060 · Kamil Trzciński · cb2f739d · 368bf99e · bae0a060
Commit bae0a060 authored May 10, 2017 by Kamil Trzciński
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

deployments_controller.rb app/controllers/projects/deployments_controller.rb +1 -1

No files found.
--- a/app/controllers/projects/deployments_controller.rb
+++ b/app/controllers/projects/deployments_controller.rb
@@ -6,7 +6,7 @@ class Projects::DeploymentsController < Projects::ApplicationController
    deployments = environment.deployments.reorder(created_at: :desc)
    deployments = deployments.where('created_at > ?', params[:after].to_time) if params[:after]&.to_time

-    render json: { deployments: DeploymentSerializer.new(user: @current_user, project: project)
+    render json: { deployments: DeploymentSerializer.new(project: project)
                                  .represent_concise(deployments) }
  end