From 77e8e9b3296f8f2d17fe2f70a644d5e05f6e7fd2 Mon Sep 17 00:00:00 2001 From: Ruben Davila Date: Thu, 17 Nov 2016 12:21:53 -0500 Subject: Backport some changes done from Time Tracking feature in EE. --- app/controllers/projects/merge_requests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects/merge_requests_controller.rb') diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index dff0213411c..f6e477dd3c3 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -61,7 +61,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController format.html { define_discussion_vars } format.json do - render json: @merge_request + render json: MergeRequestSerializer.new.represent(@merge_request) end format.patch do -- cgit v1.2.1