Backport 7175 #7182
Merged
Backport 7175 #7182
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
cfm
approved these changes
Jun 13, 2024
There was a problem hiding this comment.
Looks good pending CI and #7183:
user@sd:~/securedrop$ git checkout backport-7175
Switched to branch 'backport-7175'
Your branch is up to date with 'origin/backport-7175'.
user@sd:~/securedrop$ git merge --no-commit origin/6933-pow
Automatic merge went well; stopped before committing as requested
user@sd:~/securedrop$ git diff
user@sd:~/securedrop$ git diff --cached
diff --git a/Makefile b/Makefile
index 9aaf058df..c8b7d3d3d 100644
--- a/Makefile
+++ b/Makefile
@@ -188,6 +188,7 @@ safety: ## Run `safety check` to check python dependencies for vulnerabilities.
--ignore 67599 \
--ignore 70612 \
--ignore 71064 \
+ --ignore 70895 \
--full-report -r $$req_file \
&& echo -e '\n' \
|| exit 1; 
|
Actually, @zenmonkeykstop, it looks like this is blocked on (rebase after) #7183. |
OK, will sort it out once the other lands. |
(cherry picked from commit cf29721)
…the Source Interface (cherry picked from commit a232a54)
- #7175 (comment) - #7175 (comment) (cherry picked from commit b253e16)
…rce_interface" (cherry picked from commit 1a66400)
…app_pow_on_source_interface=True Otherwise a "securedrop-admin install" without a prior "securedrop-admin sdconfig" will default to enabling this feature. Let's not surprise an administrator who likely intended to enforce the existing configuration. Co-authored-by: Kevin O'Gorman <[email protected]> (cherry picked from commit 02a81f1)
zenmonkeykstop
force-pushed
the
backport-7175
branch
from
3368eda to
5eaa469
Compare
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
Backport of #7175.
Testing
release/2.9.0