From 5ac5510fd68fa060986733c07421d8411731ee24 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 26 Feb 2013 10:47:27 +0200
Subject: [PATCH] Fix automerge detection client-side since #3056

---
 app/controllers/merge_requests_controller.rb | 2 +-
 app/views/merge_requests/_show.html.haml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb
index b9bc99ec..67f96178 100644
--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -75,7 +75,7 @@ class MergeRequestsController < ProjectResourceController
     if @merge_request.unchecked?
       @merge_request.check_if_can_be_merged
     end
-    render json: {merge_status: @merge_request.human_merge_status_name}
+    render json: {merge_status: @merge_request.merge_status_name}
   rescue Gitlab::SatelliteNotExistError
     render json: {merge_status: :no_satellite}
   end
diff --git a/app/views/merge_requests/_show.html.haml b/app/views/merge_requests/_show.html.haml
index 6b6100f5..08b80172 100644
--- a/app/views/merge_requests/_show.html.haml
+++ b/app/views/merge_requests/_show.html.haml
@@ -32,7 +32,7 @@
       check_enable: #{@merge_request.unchecked? ? "true" : "false"},
       url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
       ci_enable: #{@project.gitlab_ci? ? "true" : "false"},
-      current_status: "#{@merge_request.human_merge_status_name}",
+      current_status: "#{@merge_request.merge_status_name}",
       action: "#{controller.action_name}"
     });
   });