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

Backport 1.4.0 changes to develop #5328

Merged
merged 3 commits into from Jun 22, 2020
Merged

Conversation

conorsch
Copy link
Contributor

Status

Ready for review.

Description of Changes

Towards #5289

Changes proposed in this pull request:

  • backports 1.4.0 release commits from release/1.4.0 branch to develop
  • updates version info 1.4.0 -> 1.5.0~rc1

See https://docs.securedrop.org/en/master/development/release_management.html#release-process for reference. We only had one rc1, so there's not much in this branch. As part of review, confirm that no commits were missed from the release/1.4.0 that should be included here.

Testing

How should the reviewer test this PR?
Write out any special testing steps here.

Deployment

Any special considerations for deployment? Consider both:

  1. Upgrading existing production instances.
  2. New installs.

Checklist

If you made changes to the server application code:

  • Linting (make lint) and tests (make test) pass in the development container

If you made changes to securedrop-admin:

  • Linting and tests (make -C admin test) pass in the admin development container

If you made changes to the system configuration:

If you made non-trivial code changes:

  • I have written a test plan and validated it for this PR

If you made changes to documentation:

  • Doc linting (make docs-lint) passed locally

If you added or updated a code dependency:

Choose one of the following:

  • I have performed a diff review and pasted the contents to the packaging wiki
  • I would like someone else to do the diff review

Allie Crevier and others added 3 commits June 18, 2020 14:56
@sssoleileraaa
Copy link
Contributor

sssoleileraaa commented Jun 18, 2020

  • correct commits were cherry-picked:
  • efd1121
  • 93f4259

These commits match what you see when you run:
git log --pretty=oneline changelog.md since the last post-release commit for 1.3.0

  • post-release version bump from 1.4.0 to 1.5.0~rc1

@eloquence
Copy link
Member

Changes LGTM as well, kicked CI.

@kushaldas
Copy link
Contributor

Kicked CI again sometime ago.

@kushaldas kushaldas merged commit 4c5f1d1 into develop Jun 22, 2020
SecureDrop Team Board automation moved this from Ready for Review to Done Jun 22, 2020
@kushaldas kushaldas deleted the backport-1.4.0-changes-to-develop branch June 22, 2020 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants