human_merge_status replaced by human_merge_status_name

app/controllers/merge_requests_controller.rb

@@ -73,7 +73,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}
+    render json: {merge_status: @merge_request.human_merge_status_name}
   rescue Gitlab::SatelliteNotExistError
     render json: {merge_status: :no_satellite}
   end

app/models/merge_request.rb

@@ -85,11 +85,6 @@ class MergeRequest < ActiveRecord::Base
   scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
   scope :by_milestone, ->(milestone) { where("milestone_id = :milestone_id", milestone_id: milestone) }
 
-  # DEPRECATED: Please use human_merge_status_name instead
-  def human_merge_status
-    human_merge_status_name
-  end
-
   def validate_branches
     if target_branch == source_branch
       errors.add :base, "You can not use same branch for source and target branches"

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}",
+      current_status: "#{@merge_request.human_merge_status_name}",
       action: "#{controller.action_name}"
     });
   });