Correctly shows close button on merge requests

Closes #19403

Correctly shows close button on merge requests
Closes #19403
c674c119 · Phil Hughes · ab81ea1e · c674c119
Commit c674c119 authored Jul 01, 2016 by Phil Hughes
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/helpers/issues_helper.rb app/helpers/issues_helper.rb +1 -1

No files found.
--- 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)