Moved merge request button visibility out of issue_helpermr-close-btn

2 files changed, 5 insertions, 1 deletions

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 46334f939d2..72bd1fbbd81 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 || (issue.try(:merged?) == closed && !issue.closed?)
+    return 'hidden' if issue.closed? == closed
   end
 
   def merge_requests_sentence(merge_requests)
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 1dd07a2a220..631a0bb758d 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -92,4 +92,8 @@ module MergeRequestsHelper
       ["#{source_path}:#{source_branch}", "#{target_path}:#{target_branch}"]
     end
   end
+
+  def merge_request_button_visibility(merge_request, closed)
+    return 'hidden' if merge_request.closed? == closed || (merge_request.merged? == closed && !merge_request.closed?)
+  end
 end