Merge pull request #2620 from mihaic/multiple-issues-in-changelog

Show multiple issue links in CHANGELOG entries
pytest-dev · Jul 26, 2017 · 1a9bc14 · 1a9bc14
2 parents dd294aa + 10ded39
commit 1a9bc14
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -0,0 +1 @@
+Show multiple issue links in CHANGELOG entries.
diff --git 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 %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Show multiple issue links in CHANGELOG entries.