diff --git a/changelog.md b/changelog.md index 449e3ce979..5eb1fdeaca 100644 --- a/changelog.md +++ b/changelog.md @@ -1,13 +1,6 @@ # Changelog -## 2.6.0~rc2 - -### Web applications -* Fixed display bug when duplicate locales are specified (#6853) -* Dependency changes: - * Update cryptography from 39.0.1 to 41.0.1 (#6855) - -## 2.6.0~rc1 +## 2.6.0 ### Web applications * Don't treat Tor Browser for Android as desktop Tor Browser (#6573) @@ -19,11 +12,13 @@ * Add `` blocks for better accessibility (#6313, #6738) * Set `Cross-Origin-Resource-Policy: same-origin` (#6768) * Automatically and regularly remove pending sources (#6488, #6785) +* Fixed display bug when duplicate locales are specified (#6853) * Dependency changes: + * Update cryptography from 39.0.1 to 41.0.1 (#6855) * Update mod-wsgi from 4.6.7 to 4.9.4 (#6775) * Update pytz from 2017.3 to 2022.2.1 (#6569, #6571) * Update pycparser from 2.20 to 2.21 (#6618, #6686) - * Update redis from 3.5.3 to 4.5.4 (#6783) + * Update redis from 3.5.3 to 4.5.4 (#6783, #6867) * Update requests from 2.26.0 to 2.31.0 (#6821) * Update wheel from 0.33.6 to 0.38.4 (#6680) * Remove passlib (#6631) diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 1e6065585d..dc85aa0b7b 100644 --- a/install_files/ansible-base/group_vars/all/securedrop +++ b/install_files/ansible-base/group_vars/all/securedrop @@ -2,7 +2,7 @@ # Variables that apply to both the app and monitor server go in this file # If the monitor or app server need different values define the variable in # hosts_vars/app.yml or host_vars/mon.yml -securedrop_version: "2.6.0~rc2" +securedrop_version: "2.6.0" securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz" grsecurity: true diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index f225a78adf..e70b4523ae 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -2.5.2 +2.6.0 diff --git a/securedrop/debian/changelog b/securedrop/debian/changelog index 64a3197b56..554064c7b2 100644 --- a/securedrop/debian/changelog +++ b/securedrop/debian/changelog @@ -1,14 +1,8 @@ -securedrop (2.6.0~rc2+focal) focal; urgency=medium +securedrop (2.6.0+focal) focal; urgency=medium * see changelog.md - -- SecureDrop Team <securedrop@freedom.press> Tue, 20 Jun 2023 15:49:14 -0400 - -securedrop (2.6.0~rc1+focal) focal; urgency=medium - - * see changelog.md - - -- SecureDrop Team <securedrop@freedom.press> Mon, 12 Jun 2023 12:38:12 -0400 + -- SecureDrop Team <securedrop@freedom.press> Thu, 22 Jun 2023 13:35:42 -0400 securedrop-app-code (2.5.2+focal) focal; urgency=medium diff --git a/securedrop/setup.py b/securedrop/setup.py index 84eb6f9e6a..6b6ec1eafb 100644 --- a/securedrop/setup.py +++ b/securedrop/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="2.6.0~rc2", + version="2.6.0", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server", diff --git a/securedrop/version.py b/securedrop/version.py index a658073c20..e5e59e38da 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = "2.6.0~rc2" +__version__ = "2.6.0"