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.

Sign up for GitHub

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

Jump to bottom

Backport 2.0.1 changelog to develop, un-xfail admin test. #6040

Merged
merged 4 commits into from
Jul 12, 2021
Merged

Backport 2.0.1 changelog to develop, un-xfail admin test. #6040

merged 4 commits into from
Jul 12, 2021

Conversation

zenmonkeykstop
Copy link
Contributor

Status

Ready for review

Description of Changes

Fixes #6034.
Fixes #6035

  • Updates the changelog with 2.0.1 changes
  • Removes the xfail marker on the admin test_update test.

Testing

  • changelog changes look valid
  • version is set to 2.1.0-rc1 correctly
  • CI passes, and test_update is not xfailing.

@zenmonkeykstop zenmonkeykstop requested a review from a team as a code owner July 9, 2021 19:49
kushaldas
kushaldas approved these changes Jul 12, 2021
View reviewed changes
Copy link
Contributor

@kushaldas kushaldas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested via

  • changelog changes look valid
  • version is set to 2.1.0-rc1 correctly
  • CI passes, and test_update is not xfailing.

Looks good, approved.

@kushaldas kushaldas merged commit 1a2494d into develop Jul 12, 2021
@zenmonkeykstop zenmonkeykstop deleted the post-2.0.1-cleanup branch July 21, 2021 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kushaldas kushaldas kushaldas approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

After 2.0.1, undo the admin test_update xfail from #6033 Release SecureDrop 2.0.1
2 participants
@zenmonkeykstop @kushaldas