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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable12] If for some reason the json can't be decoded it is not cached #7118

Merged
merged 1 commit into from Nov 9, 2017

Conversation

Projects
None yet
3 participants
@MorrisJobke
Member

MorrisJobke commented Nov 9, 2017

Should fix #6898

Backport of #7109

馃憤 from me

If for some reason the json can't be decoded it is not cached
Should fix #6898

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer

rullzer approved these changes Nov 9, 2017

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Nov 9, 2017

Codecov Report

Merging #7118 into stable12 will decrease coverage by 2.8%.
The diff coverage is 50%.

@@              Coverage Diff               @@
##             stable12    #7118      +/-   ##
==============================================
- Coverage       56.55%   53.75%   -2.81%     
- Complexity      21053    22586    +1533     
==============================================
  Files            1289     1384      +95     
  Lines           79449    86657    +7208     
  Branches         1329     1329              
==============================================
+ Hits            44935    46583    +1648     
- Misses          34514    40074    +5560
Impacted Files Coverage 螖 Complexity 螖
lib/private/Template/JSCombiner.php 88.63% <50%> (-0.9%) 25 <0> (+1)
apps/sharebymail/tests/SettingsTest.php 52.17% <0%> (-47.83%) 3% <0%> (酶)
lib/private/Security/RateLimiting/Limiter.php 55.55% <0%> (-44.45%) 5% <0%> (酶)
settings/Controller/EncryptionController.php 56% <0%> (-37.34%) 8% <0%> (酶)
settings/Controller/GroupsController.php 64.61% <0%> (-35.39%) 9% <0%> (酶)
lib/public/API.php 66.66% <0%> (-33.34%) 1% <0%> (酶)
...ps/comments/tests/Unit/AppInfo/ApplicationTest.php 69.56% <0%> (-30.44%) 4% <0%> (酶)
apps/user_ldap/lib/Configuration.php 41.5% <0%> (-29.46%) 86% <0%> (酶)
apps/encryption/lib/Command/EnableMasterKey.php 75% <0%> (-25%) 5% <0%> (酶)
lib/private/AvatarManager.php 61.9% <0%> (-24.77%) 4% <0%> (酶)
... and 269 more

codecov bot commented Nov 9, 2017

Codecov Report

Merging #7118 into stable12 will decrease coverage by 2.8%.
The diff coverage is 50%.

@@              Coverage Diff               @@
##             stable12    #7118      +/-   ##
==============================================
- Coverage       56.55%   53.75%   -2.81%     
- Complexity      21053    22586    +1533     
==============================================
  Files            1289     1384      +95     
  Lines           79449    86657    +7208     
  Branches         1329     1329              
==============================================
+ Hits            44935    46583    +1648     
- Misses          34514    40074    +5560
Impacted Files Coverage 螖 Complexity 螖
lib/private/Template/JSCombiner.php 88.63% <50%> (-0.9%) 25 <0> (+1)
apps/sharebymail/tests/SettingsTest.php 52.17% <0%> (-47.83%) 3% <0%> (酶)
lib/private/Security/RateLimiting/Limiter.php 55.55% <0%> (-44.45%) 5% <0%> (酶)
settings/Controller/EncryptionController.php 56% <0%> (-37.34%) 8% <0%> (酶)
settings/Controller/GroupsController.php 64.61% <0%> (-35.39%) 9% <0%> (酶)
lib/public/API.php 66.66% <0%> (-33.34%) 1% <0%> (酶)
...ps/comments/tests/Unit/AppInfo/ApplicationTest.php 69.56% <0%> (-30.44%) 4% <0%> (酶)
apps/user_ldap/lib/Configuration.php 41.5% <0%> (-29.46%) 86% <0%> (酶)
apps/encryption/lib/Command/EnableMasterKey.php 75% <0%> (-25%) 5% <0%> (酶)
lib/private/AvatarManager.php 61.9% <0%> (-24.77%) 4% <0%> (酶)
... and 269 more

@rullzer rullzer merged commit 531ab6f into stable12 Nov 9, 2017

1 of 3 checks passed

codecov/patch 50% of diff hit (target 56.55%)
Details
codecov/project 53.75% (-2.81%) compared to c91515c
Details
continuous-integration/drone/pr the build was successful
Details

@rullzer rullzer deleted the 12-7109 branch Nov 9, 2017

@MorrisJobke MorrisJobke referenced this pull request Nov 20, 2017

Merged

12.0.4 RC #7225

1 of 1 task complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment