diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2016-11-17 12:21:53 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-11-17 12:21:53 -0500 |
| commit | 77e8e9b3296f8f2d17fe2f70a644d5e05f6e7fd2 (patch) | |
| tree | 5f3cb9627e911a2725cbf33665f2fcfbb72f5558 /app/controllers/projects/merge_requests_controller.rb | |
| parent | aea8baed3093c513560e9ac5ac0c5c99508d3001 (diff) | |
| download | gitlab-ce-ee-backport.tar.gz | |
Backport some changes done from Time Tracking feature in EE.ee-backport
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |