diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-10 22:00:52 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-10 22:00:52 +0000 |
| commit | bae0a060ea73515139d75833fa0a291a31e18184 (patch) | |
| tree | e40ba7d21c059b8bb45886cea733850e4421fa9e | |
| parent | cb2f739d4844af094f62edb4e4dff1b3413a405b (diff) | |
| parent | 368bf99eb758a738d225134e3baa6763869e7541 (diff) | |
| download | gitlab-ce-bae0a060ea73515139d75833fa0a291a31e18184.tar.gz | |
Merge branch 'enforce-current-user-usage-on-entities' into 'master'
Make all Serializers receive `current_user` instead `user` [CE]
See merge request !11254
| -rw-r--r-- | app/controllers/projects/deployments_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb index b33c0b00ad9..f06a4d943f3 100644 --- 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 |