diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-01 09:27:34 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-04 09:09:40 +0100 |
| commit | c674c119ee463a2bfd89dfe30e6b745dfd1ae11f (patch) | |
| tree | cc33767ebd2c60a00a3597203fcbfd3468cf70c7 | |
| parent | ab81ea1e8177742a0dfed2c7cf922bb03a8b6c51 (diff) | |
| download | gitlab-ce-c674c119ee463a2bfd89dfe30e6b745dfd1ae11f.tar.gz | |
Correctly shows close button on merge requests
Closes #19403
| -rw-r--r-- | app/helpers/issues_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |