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

Docs test merge pr #5305

Closed

Conversation

zenmonkeykstop
Copy link
Contributor

Status

Work in progress

Description of Changes

Followup to #5241

This does not need to be merged - it's a test to see how CI performs with a docs master merge strategy like:

git checkout release/x.y.z
git merge -s ours master
git checkout master
git merge release/x.y.z
git checkout -b docs-merge-branch

Testing

  • Does CI pass?
  • is master identical with release/x.y.z after merge?

DrGFreeman and others added 30 commits December 14, 2019 18:32
Add basic LGTM configuration file with exclsion of the following query:
- py/import-and-import-from
Remove individual suppression of py/import-and-import-from LGTM queries
as they are now excluded by default by the LGTM configuration file.
…e-urls-in-metadata

Adds v2 and v3 source interface urls to metadata endpoint.
- Verify that the source is registered using the codename displayed in
the tab from which they proceed to submit documents even if another
codename has been generated in another tab subsequently.
- Verify that the source is redirected to /lookup when proceeding to
submit from another tab. Verify that a flash message is displayed, that
the codename is visible and matches that used to register the source in
the initial tab.
- Verify the source can submit documents from both tabs.
…nization.

- Add note about support portal ticket visibility being org-wide.

- Incorporate feedback from review.
- Move offboarding out of install guide and into topic guide (for now).
Fix screenshot typo in key rotation instructions.
…ffboarding

Added SecureDrop user offboarding guide.
…e-guide-warning

Added note in source guide to recommend against contacting FPF for help with a specific instance.
- Hiding codename to ensure flash message is visible first (prevent
browser from scrolling down to codename, potentially hiding the flash
message on small window heights).
- Improve flash message text.
- Update source interface and functional tests accordingly.
…ences-confirmation-flash

Added confirmation flash when submission preferences are saved.
Add a functional test to verify the behavior when refreshing the
/generate page when multiple instance of /generate are open
simultaneously.
…-associated-to-browser-tab

Handle multiple instances of /generate
…pparmor-rules

Adds missing Journalist Interface template files to apache2 apparmor profile
…use-latest-pip

Updated CI TBB and gui-updater-test pip dependencies
Update UA regex to match TB9 user agent strings
securedrop-app-code package: fix copyright text
rmol and others added 24 commits May 26, 2020 09:39
Add Source.deleted_at timestamp. Start generally filtering sources
that have it set. When deleting multiple sources with
journalist_app.utils.col_delete, just mark them deleted with this and
defer the removal of their submissions, keypair and database record to
asynchronous processing. Add a new systemd service to periodically
purge sources marked for deletion. It's been decided that the
journalist experience will not be changed to make this new mechanism
apparent; the messaging remains the same and there is no facility for
monitoring the deletion process.

Assign explicit names to source GPG keys. Instead of using the
python-gnupg default of "Autogenerated Key", label source keys with
"Source Key". When asked to delete a reply keypair, verify that its
UID contains one of those labels.
…g-cleaning-support

Make deletion of multiple sources asynchronous
…xes-for-1.3.0

Add upgrade boxes for 1.3.0
…exception

Adds handling for InvalidPasswordLength exception
…hinx

Fixes freedomofpress#5285 upgrades sphinx for developer requirements
Use PEP484 syntax in ./securedrop/rm.py
…ntax-1

Update syntax for type annotations
Improve the validation of nameservers in securedrop-admin. In addition
to validating the configuration in the "sdconfig" operation, check the
configuration loaded during "install", to make sure it complies with
current specifications.
…meserver-configuration

Improve nameserver configuration
Add checksdconfig.py to both securedrop-ossec-agent and
securedrop-ossec-server, so that the configuration of both app and mon
servers can be checked.
Add system configuration check script to securedrop-ossec packages
update make target fetch-tor-packages to download 0.4.3.5
@lgtm-com
Copy link

lgtm-com bot commented Jun 9, 2020

This pull request fixes 1 alert when merging ff2daf0 into f6bbe6c - view on LGTM.com

fixed alerts:

  • 1 for Unmatchable dollar in regular expression

@lgtm-com
Copy link

lgtm-com bot commented Jun 15, 2020

This pull request fixes 1 alert when merging 2b2fe71 into f6bbe6c - view on LGTM.com

fixed alerts:

  • 1 for Unmatchable dollar in regular expression

@zenmonkeykstop
Copy link
Contributor Author

Closing ticket - looking at simpler solutions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet