From c0220198d1fc880a092134a07901c52be4b3595b Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 12 Jan 2016 15:16:26 -0500
Subject: removing last chunk of MR ajax changes, rest will be in another MR

---
 app/models/merge_request.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'app/models/merge_request.rb')

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b2cb86dc1e5..c63d0c01653 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -466,6 +466,16 @@ class MergeRequest < ActiveRecord::Base
     ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
   end
 
+  def state_human_name
+    if merged?
+      "Merged"
+    elsif closed?
+      "Closed"
+    else
+      "Open"
+    end
+  end
+
   def target_sha
     @target_sha ||= target_project.
       repository.commit(target_branch).sha
-- 
cgit v1.2.1