[1.6.0] Cherry pick 5550 5549 #5552
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 and
redshiftzero
as code owners
|
I think I made mistake while doing conflict fix for |
kushaldas
force-pushed
the
cherry_pick_5550_5549
branch
from
1a814d8
to
08b02ab
Compare
|
Trying again |
|
This probably isn't going to pass CI unless the changes in #5520 are backported as well - lint job is failing because docs python dependencies are no longer present. |
(cherry picked from commit 77bdf61)
- also updated pip-tools to 4.5.1 (cherry picked from commit 6e86271)
* added exception handling around the delete_file_object function, to catch errors caused by missing files in instance storage * disabled shellcheck for SC1090 errors, which were being triggered by a shell script in the admin venv (cherry picked from commit 0bfca03)
(cherry picked from commit 040f028)
emkll
force-pushed
the
cherry_pick_5550_5549
branch
from
08b02ab
to
c15f934
Compare
|
Updated this branch with local changes preserving docs requirements. CI should now pass on this branch |
zenmonkeykstop
approved these changes
Oct 5, 2020
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
Cherry picking commits from #5550 and #5549 PRs.
Had to solve the merge conflicts.
Make sure no other dependencies were added/modified/removed in the rebase operation / conflict resolution
Testing
How should the reviewer test this PR?
Write out any special testing steps here.
Deployment
Any special considerations for deployment? Consider both:
Checklist
If you made changes to the server application code:
make lint) and tests (make test) pass in the development containerIf you made changes to
securedrop-admin:make -C admin test) pass in the admin development containerIf you made changes to the system configuration:
If you made non-trivial code changes:
If you made changes to documentation:
make docs-lint) passed locallyIf you added or updated a code dependency:
Choose one of the following: