Fixes #4677 warns admin if v3 and https both are enabled #4720
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
emkll,
heartsucker,
msheiny and
redshiftzero
as code owners
Codecov Report
@@ Coverage Diff @@
## develop #4720 +/- ##
========================================
Coverage 81.61% 81.61%
========================================
Files 49 49
Lines 3416 3416
Branches 391 391
========================================
Hits 2788 2788
Misses 535 535
Partials 93 93Continue to review full report at Codecov.
|
|
#4710 is merged. I see conflicts, @kushaldas—can you rebase and mark ready for review when you're satisfied? |
kushaldas
force-pushed
the
v3_and_https_may_not_be_friends
branch
from
54be689
to
33298e9
Compare
redshiftzero
approved these changes
Aug 30, 2019
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
Fixes #4677 This should be pulled in after #4710 is merged
We should decide the actual warning text and update in this PR. @redshiftzero
Testing
./securedrop-admin sdconfigDeployment
Any special considerations for deployment? Consider both:
Checklist
If you made changes to the server application code:
make lint) and tests (make -C securedrop 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 locally