diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-10-13 09:41:46 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-10-16 09:59:32 +0200 |
| commit | 94a788f66dfcc13ad02855b05c38826f958038af (patch) | |
| tree | e99ed267a2e646607f05a7632feefd3a776b5d0b /app/views/projects/issues | |
| parent | 9f9f0c35ecd9f7a5a057030253791d051f832f6d (diff) | |
| download | gitlab-ce-94a788f66dfcc13ad02855b05c38826f958038af.tar.gz | |
Only accept open issues and merge requests
Diffstat (limited to 'app/views/projects/issues')
| -rw-r--r-- | app/views/projects/issues/_closed_by_box.html.haml | 9 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/app/views/projects/issues/_closed_by_box.html.haml b/app/views/projects/issues/_closed_by_box.html.haml index fe886b6d7d7..aef352029d0 100644 --- a/app/views/projects/issues/_closed_by_box.html.haml +++ b/app/views/projects/issues/_closed_by_box.html.haml @@ -1,6 +1,3 @@ -.issue-closed-by-widget - %i.fa.fa-check - - if @closed_by_mr.count == 1 - This issue will be closed when #{gfm(@closed_by_mr.first.to_reference)} is accepted. - -else - This issue will be closed when any of merge requests #{gfm(merge_requests_sentence(@closed_by_mr.sort))} is accepted. +.issue-closed-by-widget + = icon('check') + This issue will be closed automatically when merge request #{gfm(merge_requests_sentence(@closed_by_merge_requests.sort))} is accepted. diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 309f276882d..f01bf2505da 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -46,7 +46,7 @@ = markdown(@issue.description) %textarea.hidden.js-task-list-field = @issue.description - - if @closed_by_mr.present? + - if @closed_by_merge_requests.present? = render 'projects/issues/closed_by_box' .issue-discussion = render 'projects/issues/discussion' |