summaryrefslogtreecommitdiff
path: root/app/views/projects/issues/_closed_by_box.html.haml
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-10-12 12:04:20 +0200
committerZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-10-16 09:46:59 +0200
commit9f9f0c35ecd9f7a5a057030253791d051f832f6d (patch)
tree40d69fa1493e50bef566d104b58c4316db69d95b /app/views/projects/issues/_closed_by_box.html.haml
parentbd3689e9e0aebe43f7c5f787e03a3bbaa8b2ef68 (diff)
downloadgitlab-ce-9f9f0c35ecd9f7a5a057030253791d051f832f6d.tar.gz
Show merge requests which close current issue
Diffstat (limited to 'app/views/projects/issues/_closed_by_box.html.haml')
-rw-r--r--app/views/projects/issues/_closed_by_box.html.haml6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/issues/_closed_by_box.html.haml b/app/views/projects/issues/_closed_by_box.html.haml
new file mode 100644
index 00000000000..fe886b6d7d7
--- /dev/null
+++ b/app/views/projects/issues/_closed_by_box.html.haml
@@ -0,0 +1,6 @@
+.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.