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

[stable10] Fix invalid token on pw reset #35597

Merged
merged 1 commit into from
Jun 20, 2019

Conversation

micbar
Copy link
Contributor

@micbar micbar commented Jun 19, 2019

Backport of #35595

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

@micbar micbar self-assigned this Jun 19, 2019
@micbar micbar requested review from oparoz, patrickjahns and IljaN and removed request for oparoz June 19, 2019 09:57
@micbar micbar added 3 - To Review Type:Bug p2-high Escalation, on top of current planning, release blocker labels Jun 19, 2019
@micbar micbar changed the title Fix invalid token on pw reset [stable10] Fix invalid token on pw reset Jun 19, 2019
@micbar micbar force-pushed the stable10-fix-invalid-token branch 2 times, most recently from 0d26dab to 25ac42e Compare June 19, 2019 13:12
@codecov
Copy link

codecov bot commented Jun 19, 2019

Codecov Report

Merging #35597 into stable10 will increase coverage by 0.69%.
The diff coverage is 100%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35597      +/-   ##
==============================================
+ Coverage       64.11%   64.81%   +0.69%     
+ Complexity      20210    20209       -1     
==============================================
  Files            1294     1294              
  Lines           77218    77262      +44     
  Branches         1301     1301              
==============================================
+ Hits            49510    50079     +569     
+ Misses          27323    26798     -525     
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.97% <100%> (+0.77%) 20209 <0> (-1) ⬇️
Impacted Files Coverage Δ Complexity Δ
core/Controller/LostController.php 89.18% <100%> (+0.69%) 37 <0> (+4) ⬆️
lib/private/Files/Cache/HomePropagator.php 88.88% <0%> (-11.12%) 3% <0%> (ø)
apps/files/lib/Command/Scan.php 71.91% <0%> (-9.17%) 74% <0%> (ø)
lib/private/Repair/SqliteAutoincrement.php 85.18% <0%> (-3.28%) 9% <0%> (ø)
lib/private/DB/AdapterSqlite.php 83.33% <0%> (-2.88%) 7% <0%> (ø)
lib/private/Share20/Manager.php 97.43% <0%> (-0.04%) 230% <0%> (-5%)
apps/dav/lib/CalDAV/CalDavBackend.php 80.65% <0%> (+0.13%) 179% <0%> (ø) ⬇️
apps/dav/lib/CardDAV/CardDavBackend.php 83.29% <0%> (+0.23%) 86% <0%> (ø) ⬇️
lib/private/Share/Share.php 71.61% <0%> (+0.27%) 507% <0%> (ø) ⬇️
lib/private/Files/View.php 86.14% <0%> (+0.3%) 399% <0%> (ø) ⬇️
... and 39 more

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 2fc20bb...25ac42e. Read the comment docs.

@codecov
Copy link

codecov bot commented Jun 19, 2019

Codecov Report

Merging #35597 into stable10 will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35597      +/-   ##
==============================================
+ Coverage       64.81%   64.82%   +<.01%     
- Complexity      20211    20215       +4     
==============================================
  Files            1294     1294              
  Lines           77267    77276       +9     
  Branches         1301     1301              
==============================================
+ Hits            50084    50093       +9     
  Misses          26798    26798              
  Partials          385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.98% <100%> (ø) 20215 <0> (+4) ⬆️
Impacted Files Coverage Δ Complexity Δ
core/Controller/LostController.php 89.18% <100%> (+0.69%) 37 <0> (+4) ⬆️

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 9a0ee06...faa5a2f. Read the comment docs.

@phil-davis
Copy link
Contributor

@micbar is a backport to release-10.2.1 coming?

@micbar
Copy link
Contributor Author

micbar commented Jun 19, 2019

@micbar is a backport to release-10.2.1 coming?

Backport to release-10.2.1 #35607

@micbar micbar force-pushed the stable10-fix-invalid-token branch from 25ac42e to faa5a2f Compare June 19, 2019 17:29
@phil-davis phil-davis merged commit 463d4ea into stable10 Jun 20, 2019
@delete-merged-branch delete-merged-branch bot deleted the stable10-fix-invalid-token branch June 20, 2019 08:06
@phil-davis phil-davis mentioned this pull request Jun 21, 2019
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4 - To release p2-high Escalation, on top of current planning, release blocker Type:Bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants