Skip to content

Unlock files even if an exception occurs (stable12) - #7144

Merged
MorrisJobke merged 1 commit into
stable12from
rename-locks-stable12
Dec 4, 2017
Merged

Unlock files even if an exception occurs (stable12)#7144
MorrisJobke merged 1 commit into
stable12from
rename-locks-stable12

Conversation

@korelstar

Copy link
Copy Markdown
Member

Backport of #7014 for stable12.

Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
@codecov

codecovBot commented Nov 11, 2017

Copy link
Copy Markdown

Codecov Report

Merging #7144 into stable12 will increase coverage by <.01%.
The diff coverage is 94.82%.

@@ Coverage Diff @@## stable12 #7144 +/- ##
==============================================
+ Coverage 53.76% 53.76% +<.01% - Complexity 22587 22588 +1 
==============================================
Files 1384 1384 Lines 86660 86663 +3 Branches 1329 1329 ==============================================
+ Hits 46591 46595 +4 + Misses 40069 40068 -1
Impacted FilesCoverage ΔComplexity Δ
lib/private/Files/View.php83.86% <94.82%> (+0.04%)372 <0> (+1)⬆️
lib/private/Security/CertificateManager.php91.08% <0%> (-1%)39% <0%> (ø)
lib/private/Server.php84.8% <0%> (+0.12%)121% <0%> (ø)⬇️
lib/private/Files/Cache/Propagator.php96.2% <0%> (+1.26%)16% <0%> (ø)⬇️

@korelstar

Copy link
Copy Markdown
MemberAuthor

Can we put this into 12.0.4?

@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.

Makes sense 👍

@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 Nov 27, 2017
@MorrisJobke

Copy link
Copy Markdown
Member

Let's wait for this merge until 12.0.4 is out

LukasReschke
LukasReschke previously requested changes Nov 27, 2017

@LukasReschkeLukasReschke 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.

Blocking with "Request changes" so it doesn't accidentally get merged :)

@MorrisJobke
MorrisJobke merged commit 1cd5ba3 into stable12Dec 4, 2017
@MorrisJobke
MorrisJobke deleted the rename-locks-stable12 branch December 4, 2017 10:13
@MorrisJobkeMorrisJobke mentioned this pull request Jan 8, 2018
13 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 finishbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@korelstar@MorrisJobke@rullzer@LukasReschke