Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump 2.6.0 rc2 version #6863

Merged
merged 1 commit into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# 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

### Web applications
Expand All @@ -23,7 +30,7 @@
* Remove pyotp (#5613, #6679)

### Journalist Workstation
* Add a GNOME shell extension (#6531, #6712)
* Add a GNOME shell extension (#6531, #6712, 6847)

### Operations
* Update SecureDrop release key expiry date to 2024-07-08 (#6803, #6804, #6819)
Expand Down
2 changes: 1 addition & 1 deletion install_files/ansible-base/group_vars/all/securedrop
Original file line number Diff line number Diff line change
Expand Up @@ -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~rc1"
securedrop_version: "2.6.0~rc2"
securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz"

grsecurity: true
Expand Down
6 changes: 6 additions & 0 deletions securedrop/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
securedrop (2.6.0~rc2+focal) focal; urgency=medium

* see changelog.md

-- SecureDrop Team <[email protected]> Tue, 20 Jun 2023 15:49:14 -0400

securedrop (2.6.0~rc1+focal) focal; urgency=medium

* see changelog.md
Expand Down
2 changes: 1 addition & 1 deletion securedrop/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

setuptools.setup(
name="securedrop-app-code",
version="2.6.0~rc1",
version="2.6.0~rc2",
author="Freedom of the Press Foundation",
author_email="[email protected]",
description="SecureDrop Server",
Expand Down
2 changes: 1 addition & 1 deletion securedrop/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.6.0~rc1"
__version__ = "2.6.0~rc2"