reverting merge_request_controller

1 files changed, 2 insertions, 9 deletions

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index d85ef229254..de948d271c8 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -48,15 +48,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
       group(:commit_id).count
 
-    json_merge_request = @merge_requests.as_json
-
     respond_to do |format|
       format.html
-      format.json do 
-        render json: {
-          hi: "yes"
-        }
-      end
+      format.json { render json: @merge_request }
       format.diff { render text: @merge_request.to_diff(current_user) }
       format.patch { render text: @merge_request.to_patch(current_user) }
     end
@@ -149,8 +143,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
         format.json do
           render json: {
             saved: @merge_request.valid?,
-            assignee_avatar_url: @merge_request.assignee.try(:avatar_url),
-            closed_event: @merge_request.closed_event
+            assignee_avatar_url: @merge_request.assignee.try(:avatar_url)
           }
         end
       end