From c674c119ee463a2bfd89dfe30e6b745dfd1ae11f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 1 Jul 2016 09:27:34 +0100
Subject: [PATCH] Correctly shows close button on merge requests

Closes #19403
---
 app/helpers/issues_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 72bd1fbbd81..46334f939d2 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -102,7 +102,7 @@ module IssuesHelper
   end
 
   def issue_button_visibility(issue, closed)
-    return 'hidden' if issue.closed? == closed
+    return 'hidden' if issue.closed? == closed || (issue.try(:merged?) == closed && !issue.closed?)
   end
 
   def merge_requests_sentence(merge_requests)
-- 
GitLab