Skip to content

[stable13] do not catch and ignore ServerNotAvailable in the wrong spot - #8073

Merged
MorrisJobke merged 1 commit into
stable13from
stable13-8069
Jan 31, 2018
Merged

[stable13] do not catch and ignore ServerNotAvailable in the wrong spot #8073
MorrisJobke merged 1 commit into
stable13from
stable13-8069

Conversation

@blizzz

Copy link
Copy Markdown
Member

backport of #8069

might cause the user to be unavailable (race condition).
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzzblizzz added this to the Nextcloud 13.0.1 milestone Jan 26, 2018
@codecov

codecovBot commented Jan 26, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8073 into stable13 will decrease coverage by <.01%.
The diff coverage is 50%.

@@ Coverage Diff @@## stable13 #8073 +/- ##
==============================================
- Coverage 51.23% 51.23% -0.01% - Complexity 24981 24982 +1 
==============================================
Files 1607 1607 Lines 95049 95051 +2 Branches 1376 1376 ==============================================
+ Hits 48696 48697 +1 - Misses 46353 46354 +1
Impacted FilesCoverage ΔComplexity Δ
apps/user_ldap/lib/Access.php35.61% <ø> (ø)316 <0> (ø)⬇️
apps/user_ldap/lib/User_LDAP.php76.49% <50%> (-0.58%)84 <0> (+1)
apps/files_trashbin/lib/Trashbin.php72.28% <0%> (-0.25%)136% <0%> (ø)
core/js/js.js66.4% <0%> (+0.11%)0% <0%> (ø)⬇️
lib/private/Server.php81.55% <0%> (+0.11%)134% <0%> (ø)⬇️

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

⚠️ But wait until 13.0.0 is out ⚠️

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 27, 2018
@MorrisJobke
MorrisJobke merged commit bb7a2b2 into stable13Jan 31, 2018
@MorrisJobke
MorrisJobke deleted the stable13-8069 branch January 31, 2018 13:46
@MorrisJobkeMorrisJobke mentioned this pull request Jan 31, 2018
2 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: ldap

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@blizzz@rullzer@MorrisJobke