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

[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

MorrisJobke
Copy link
Member

Should fix #6898

Backport of #7109

👍 from me

Should fix #6898

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 9, 2017
@codecov
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants