diff --git a/docs/user/release_notes.rst b/docs/user/release_notes.rst
index 22df6a3530..8de7e147c3 100644
--- a/docs/user/release_notes.rst
+++ b/docs/user/release_notes.rst
@@ -4,6 +4,7 @@ Release notes
.. towncrier release notes start
+
v5.0.0
======
@@ -64,6 +65,13 @@ Features
* Add frozen release state to bodhi releases list.
* Add API call to retrigger update tests.
* Tidy up the UI.
+* Add --user and --password to all actions of the bodhi CLI supporting
+ --openid-api (for example: waive and trigger) (:pr:`3550`).
+* Update ChartJS package and redesign Release page (:pr:`3671`).
+* Automatically created updates (e.g. Fedora Rawhide single package updates)
+ now include a changelog entry in the update notes. (:issue:`3192`).
+* Move multi build update that failed to merge in rawhide to pending.
+ (:issue:`3514`).
Bug fixes
@@ -83,6 +91,9 @@ Bug fixes
* Allow only 1 update per side tag (:issue:`3484`).
* Disable comments on updates when update is pushed and stable (:issue:`2050`).
* Unify rawhide simple build update with multi build update (:issue:`3513`).
+* Prevent crash when compose contains update without builds (:issue:`3471`).
+* Added build.update.pushed = True for the signed consumer so that it can be
+ unpushed. (:issue:`3625`).
Development improvements
@@ -96,6 +107,14 @@ Development improvements
* Provide authentication in the integration testing environment.
* Make it easier to develop using VS Code.
* Add option to vagrant provisioning to use stg infra.
+* Introduction of `Towncrier `_ to
+ manage the release notes (:issue:`3562`).
+
+
+Other changes
+^^^^^^^^^^^^^
+
+* List items in RSS feed starting from the most recent (:pr:`3621`).
Contributors
@@ -105,17 +124,24 @@ The following developers contributed to Bodhi 5.0.0:
* Anatoli Babenia
* Aurélien Bompard
+* Randy Barlow
* Clement Verna
+* David Fan
+* dimitraz
* Lukas Holecek
* Mattia Verga
* Michal Konečný
* Nils Philippsen
* Ondrej Nosek
* Pierre-Yves Chibon
-* Randy Barlow
* Rick Elrod
-* Robert Scheck
* Ryan Lerch
+* Robert Scheck
+* Rob Shelly
+* Sam Robbins
+* Stephen Coady
+* siddharthvipul
+* subhamkrai
* Sebastian Wojciechowski
diff --git a/news/3192.feature b/news/3192.feature
deleted file mode 100644
index 0d5879efc9..0000000000
--- a/news/3192.feature
+++ /dev/null
@@ -1 +0,0 @@
-Automatically created updates (e.g. Fedora Rawhide single package updates) now include a changelog entry in the update notes.
\ No newline at end of file
diff --git a/news/3471.bug b/news/3471.bug
deleted file mode 100644
index e09d9dc8ef..0000000000
--- a/news/3471.bug
+++ /dev/null
@@ -1 +0,0 @@
-Prevent crash when compose contains update without builds
diff --git a/news/3514.feature b/news/3514.feature
deleted file mode 100644
index 249a1e2411..0000000000
--- a/news/3514.feature
+++ /dev/null
@@ -1 +0,0 @@
-Move multi build update that failed to merge in rawhide to pending.
diff --git a/news/3562.dev b/news/3562.dev
deleted file mode 100644
index 0ce816c097..0000000000
--- a/news/3562.dev
+++ /dev/null
@@ -1 +0,0 @@
-Introduction of `Towncrier `_ to manage the release notes
diff --git a/news/3625.bug b/news/3625.bug
deleted file mode 100644
index ec8269f65f..0000000000
--- a/news/3625.bug
+++ /dev/null
@@ -1 +0,0 @@
-Added build.update.pushed = True for the signed consumer so that it can be unpushed.
\ No newline at end of file
diff --git a/news/PR3550.feature b/news/PR3550.feature
deleted file mode 100644
index c9a199e069..0000000000
--- a/news/PR3550.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add --user and --password to all actions of the bodhi CLI supporting --openid-api (for example: waive and trigger)
diff --git a/news/PR3621.other b/news/PR3621.other
deleted file mode 100644
index bada0cc5a4..0000000000
--- a/news/PR3621.other
+++ /dev/null
@@ -1 +0,0 @@
-List items in RSS feed starting from the most recent
diff --git a/news/PR3671.feature b/news/PR3671.feature
deleted file mode 100644
index 39ec6f4fe3..0000000000
--- a/news/PR3671.feature
+++ /dev/null
@@ -1 +0,0 @@
-Update ChartJS package and redesign Release page
diff --git a/news/_template.rst b/news/_template.rst
index 5c1a7a2afa..76710e24f8 100644
--- a/news/_template.rst
+++ b/news/_template.rst
@@ -27,7 +27,6 @@ This is a {major|feature|bugfix} release that adds [short summary].
{{ reference(value) }}
{%- if not loop.last %}, {% endif -%}
{%- endfor %}).
-
{% endfor %}
{% elif category == "migration" %}
This release contains database migrations. To apply them, run::
@@ -48,6 +47,7 @@ No significant changes.
{% if sections[section]["author"] %}
{{definitions['author']["name"]}}
{{ underline * definitions['author']['name']|length }}
+
The following developers contributed to this release of Bodhi:
{% for text, values in sections[section]["author"].items() %}
diff --git a/news/aurelien.author b/news/aurelien.author
deleted file mode 100644
index 5b8a3e7bbb..0000000000
--- a/news/aurelien.author
+++ /dev/null
@@ -1 +0,0 @@
-Aurélien Bompard
diff --git a/news/mattia.verga.author b/news/mattia.verga.author
deleted file mode 100644
index 2028cbf806..0000000000
--- a/news/mattia.verga.author
+++ /dev/null
@@ -1 +0,0 @@
-Mattia Verga