diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 1d30b888028435aa392e5e922e1dee12ec6fb9db..157ea636b34079ae7c8074d37a6fd4efd4bcff26 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -1,4 +1,4 @@ -class Projects::MergeRequestsController < Projects::ApplicationController + Projects::MergeRequestsController < Projects::ApplicationController include ToggleSubscriptionAction include DiffForPath include DiffHelper @@ -315,7 +315,7 @@ def update render :edit end end - + format.json do render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short]) end