[1.0.0] Backport of #4728 #4730 #4732 into 1.0.0 #4737
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kushaldas
requested review from
conorsch,
emkll,
heartsucker,
msheiny and
redshiftzero
as code owners
emkll
approved these changes
Sep 4, 2019
There was a problem hiding this comment.
Thanks for backporting, @kushaldas. Confirming commits are the same, good to merge when CI passes.
emkll
changed the title
|
staging-test-with-rebase failed (see https://circleci.com/gh/freedomofpress/securedrop/33229), restarted the job and opened #4740 to track. |
|
staging-test-with-rebase now passing, merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description of Changes
This is the back port of #4728 #4730 #4732 into
1.0.0 releasebranch.Changes proposed in this pull request:
Testing
Make sure that they have the same commits.