From 10ded399d8246ef8383d5cac27f58fe9b0c65fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mihai=20Capot=C4=83?= <mihai@mihaic.ro>
Date: Wed, 26 Jul 2017 09:55:42 -0700
Subject: [PATCH] Show multiple issue links in CHANGELOG entries

Restores the functionality removed in PR #2488.
---
 AUTHORS                 | 1 +
 changelog/2620.trivial  | 1 +
 changelog/_template.rst | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 changelog/2620.trivial

diff --git a/AUTHORS b/AUTHORS
index d58cd3d2df1..5259d0322f9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -120,6 +120,7 @@ Michael Birtwell
 Michael Droettboom
 Michael Seifert
 Michal Wajszczuk
+Mihai Capotă
 Mike Lundy
 Ned Batchelder
 Neven Mundar
diff --git a/changelog/2620.trivial b/changelog/2620.trivial
new file mode 100644
index 00000000000..51c0bd160d8
--- /dev/null
+++ b/changelog/2620.trivial
@@ -0,0 +1 @@
+Show multiple issue links in CHANGELOG entries.
diff --git a/changelog/_template.rst b/changelog/_template.rst
index 66c850ffd1c..a898abc15af 100644
--- a/changelog/_template.rst
+++ b/changelog/_template.rst
@@ -13,7 +13,8 @@
 
 {% if definitions[category]['showcontent'] %}
 {% for text, values in sections[section][category]|dictsort(by='value') %}
-- {{ text }}{% if category != 'vendor' %} (`{{ values[0] }} <https://github.com/pytest-dev/pytest/issues/{{ values[0][1:] }}>`_){% endif %}
+{% set issue_joiner = joiner(', ') %}
+- {{ text }}{% if category != 'vendor' %} ({% for value in values|sort %}{{ issue_joiner() }}`{{ value }} <https://github.com/pytest-dev/pytest/issues/{{ value[1:] }}>`_{% endfor %}){% endif %}
 
 
 {% endfor %}