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

Add changelog commits from 0.14.0 #4616

Merged
merged 5 commits into from
Jul 14, 2019
Merged

Conversation

redshiftzero
Copy link
Contributor

@redshiftzero redshiftzero commented Jul 10, 2019

Status

Ready for review

Description of Changes

Towards #4550

Changes proposed in this pull request:

  • Merges changelog commits back to develop
  • Bump to 1.0.0~rc1

Testing

Ensure all commits are properly backported from the release branch

Deployment

Already in prod

Checklist

If you made changes to the server application code:

  • Linting (make lint) and tests (make -C securedrop test) pass in the development container

If you made changes to securedrop-admin:

  • Linting and tests (make -C admin test) pass in the admin development container

If you made changes to the system configuration:

If you made non-trivial code changes:

  • I have written a test plan and validated it for this PR

If you made changes to documentation:

  • Doc linting (make docs-lint) passed locally

@codecov-io
Copy link

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #4616   +/-   ##
========================================
  Coverage    82.63%   82.63%           
========================================
  Files           45       45           
  Lines         3122     3122           
  Branches       337      337           
========================================
  Hits          2580     2580           
  Misses         456      456           
  Partials        86       86

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 778e370...b52c422. Read the comment docs.

@emkll emkll mentioned this pull request Jul 11, 2019
7 tasks
@redshiftzero redshiftzero mentioned this pull request Jul 11, 2019
19 tasks
redshiftzero and others added 5 commits July 11, 2019 13:39
(cherry picked from commit 0e6c0bc)
(cherry picked from commit c00b3b0)
(cherry picked from commit 5aa055f)
This was accidentally left in the 0.14.0 final release. Its presence should
cause no issues, but we should remove to prevent confusion for the next cycle.
@emkll emkll force-pushed the add-changelog-commits-0.14.0 branch from b52c422 to 0c8af94 Compare July 11, 2019 17:42
@emkll emkll changed the title [wip] add changelog commits from 0.14.0 Add changelog commits from 0.14.0 Jul 11, 2019
@emkll
Copy link
Contributor

emkll commented Jul 11, 2019

Rebased on latest develop and appended 0c8af94 to bump version to 1.0.0~rc1. This should now be ready for re-review.

@redshiftzero 's changes look good to me, but since I've appended 0c8af94 to bump version, could another maintainer please review these changes?

Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

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

LGTM based on diff review!

@zenmonkeykstop zenmonkeykstop merged commit a99011a into develop Jul 14, 2019
@emkll emkll deleted the add-changelog-commits-0.14.0 branch October 8, 2019 13:28
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.

4 participants