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

backport changelog entries from 1.0.0 and updates to 1.1.0~rc1 #4840

Merged
merged 7 commits into from Sep 18, 2019

Conversation

kushaldas
Copy link
Contributor

Status

Ready for review

Description of Changes

Adds the changelog entries from 1.0.0 release and
updates release to 1.1.0~rc1

Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

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

Thanks for the backport @kushaldas!

  1. It seems like molecule/shared/stable.ver changes were not backported [0] , this is required for upgrade boxes. I just checked, and the stable.ver file was correctly updated in the release branch [1].
  2. In the past, we've committed each rc commit for posterity in develop (see [2]). Could you please add the commits for rc2,3 and 4? They won't affect the diff but it would be good to have them.

[0] https://github.com/freedomofpress/securedrop/blob/backport_changelog_1/molecule/shared/stable.ver#L1
[1] https://github.com/freedomofpress/securedrop/blob/release/1.0.0/molecule/shared/stable.ver
[2] https://github.com/freedomofpress/securedrop/pull/4389/commits

@redshiftzero redshiftzero mentioned this pull request Sep 18, 2019
23 tasks
redshiftzero and others added 6 commits September 18, 2019 21:31
(cherry picked from commit 4b4e557)
(cherry picked from commit 09bfa45)
(cherry picked from commit 874d48c)
(cherry picked from commit 392a6e7)
(cherry picked from commit 162288f)
@codecov-io
Copy link

codecov-io commented Sep 18, 2019

Codecov Report

Merging #4840 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #4840   +/-   ##
========================================
  Coverage    81.74%   81.74%           
========================================
  Files           49       49           
  Lines         3418     3418           
  Branches       392      392           
========================================
  Hits          2794     2794           
  Misses         533      533           
  Partials        91       91

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5fc5ed5...e7d2dc3. Read the comment docs.

Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks @kushaldas , good to merge when CI passes.

There's a seemingly unrelated app error /flake in https://circleci.com/gh/freedomofpress/securedrop/34576 , which we should restart and ensure it passes prior to merge.

@zenmonkeykstop zenmonkeykstop merged commit d71b0d0 into develop Sep 18, 2019
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

6 participants