diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-10 22:00:52 +0000 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-05-10 16:14:01 -0600 |
| commit | 6d81a38294b44aee378814aee7fbf2bd0386c888 (patch) | |
| tree | 4660d23db4566329fbe356bda820ff215f769e46 | |
| parent | 0e175cf9d9fe575767f86c51a830f372cf980445 (diff) | |
| download | gitlab-ce-6d81a38294b44aee378814aee7fbf2bd0386c888.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 |