diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-10-31 16:15:03 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-31 16:15:03 +0000 |
| commit | 6dc9028fbb3856c8c7814446ed176880f7d5213f (patch) | |
| tree | b45870b8c946e5304a2fd3ad64a1453d166da0ca /app/controllers/projects | |
| parent | 74a0e855e1d5049e265c85ac01d511c25f2a46f1 (diff) | |
| download | gitlab-ce-6dc9028fbb3856c8c7814446ed176880f7d5213f.tar.gz | |
Load participants async
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index fe1334c0cfe..6a5e4538717 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -74,7 +74,7 @@ class Projects::IssuesController < Projects::ApplicationController respond_to do |format| format.html format.json do - render json: serializer.represent(@issue) + render json: serializer.represent(@issue, serializer: params[:serializer]) end end end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index c5204080333..2b0294c8387 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -83,7 +83,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo format.json do Gitlab::PollingInterval.set_header(response, interval: 10_000) - render json: serializer.represent(@merge_request, basic: params[:basic]) + render json: serializer.represent(@merge_request, serializer: params[:serializer]) end format.patch do |