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] don't reset quota #6910

Merged
merged 3 commits into from Oct 23, 2017

Conversation

Projects
None yet
4 participants
@blizzz
Member

blizzz commented Oct 23, 2017

backport of #6677

jvillafanez and others added some commits Aug 16, 2017

Keep the current quota if no suitable quota is found
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Adjust unittest
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
and add missing whitespaces to log outout
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

@blizzz blizzz added this to the Nextcloud 12.0.4 milestone Oct 23, 2017

@blizzz blizzz requested review from rullzer, MorrisJobke and LukasReschke Oct 23, 2017

@blizzz blizzz added the downstream label Oct 23, 2017

@blizzz blizzz referenced this pull request Oct 23, 2017

Merged

don't reset quota #6677

@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Oct 23, 2017

Codecov Report

Merging #6910 into stable12 will increase coverage by <.01%.
The diff coverage is 0%.

@@              Coverage Diff               @@
##             stable12    #6910      +/-   ##
==============================================
+ Coverage       53.75%   53.75%   +<.01%     
  Complexity      22566    22566              
==============================================
  Files            1384     1384              
  Lines           86591    86590       -1     
  Branches         1329     1329              
==============================================
  Hits            46549    46549              
+ Misses          40042    40041       -1
Impacted Files Coverage Δ Complexity Δ
apps/user_ldap/lib/User/User.php 80.8% <ø> (-0.07%) 123 <0> (ø)
apps/user_ldap/lib/Connection.php 53.35% <0%> (ø) 115 <0> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (ø) ⬇️

codecov bot commented Oct 23, 2017

Codecov Report

Merging #6910 into stable12 will increase coverage by <.01%.
The diff coverage is 0%.

@@              Coverage Diff               @@
##             stable12    #6910      +/-   ##
==============================================
+ Coverage       53.75%   53.75%   +<.01%     
  Complexity      22566    22566              
==============================================
  Files            1384     1384              
  Lines           86591    86590       -1     
  Branches         1329     1329              
==============================================
  Hits            46549    46549              
+ Misses          40042    40041       -1
Impacted Files Coverage Δ Complexity Δ
apps/user_ldap/lib/User/User.php 80.8% <ø> (-0.07%) 123 <0> (ø)
apps/user_ldap/lib/Connection.php 53.35% <0%> (ø) 115 <0> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (ø) ⬇️

@MorrisJobke MorrisJobke merged commit ad66244 into stable12 Oct 23, 2017

2 of 3 checks passed

codecov/patch 0% of diff hit (target 53.75%)
Details
codecov/project 53.75% (+<.01%) compared to e70135b
Details
continuous-integration/drone/pr the build was successful
Details

@MorrisJobke MorrisJobke deleted the backport-6677-s12 branch Oct 23, 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