Skip to content

[stable12] Remove wrong entry in admin_settings that causes 500 - #7455

Merged
MorrisJobke merged 1 commit into
stable12from
12_7230
Dec 11, 2017
Merged

[stable12] Remove wrong entry in admin_settings that causes 500#7455
MorrisJobke merged 1 commit into
stable12from
12_7230

Conversation

@rullzer

@rullzerrullzer commented Dec 11, 2017

Copy link
Copy Markdown
Member

Backport of #7230

@MorrisJobke@rullzer
Remove wrong entry in admin_settings that causes 500
d419711
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@rullzerrullzer added this to the Nextcloud 12.0.5 milestone Dec 11, 2017
@rullzerrullzer mentioned this pull request Dec 11, 2017
Merged
ChristophWurst
ChristophWurst approved these changes Dec 11, 2017
View reviewed changes

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

Looks good

@codecov

codecovBot commented Dec 11, 2017•
edited
Loading

Copy link
Copy Markdown

Codecov Report

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

@@ Coverage Diff @@## stable12 #7455 +/- ##
==============================================
+ Coverage 53.92% 53.92% +<.01% - Complexity 22701 22702 +1 
==============================================
Files 1384 1384 Lines 86955 86958 +3 Branches 1330 1330 ==============================================
+ Hits 46889 46895 +6 + Misses 40066 40063 -3
Impacted FilesCoverage ΔComplexity Δ
lib/private/Settings/Manager.php43.37% <0%> (-0.8%)45 <0> (+1)
core/js/js.js61.83% <0%> (+0.55%)0% <0%> (ø)⬇️
apps/files_trashbin/lib/Expiration.php91.93% <0%> (+1.61%)29% <0%> (ø)⬇️

danxuliu
danxuliu approved these changes Dec 11, 2017
View reviewed changes

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

Tested (as described in #7230) and works (there is no longer an error and the stale entry is cleaned) 👍

@ChristophWurstChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 11, 2017
@MorrisJobke
MorrisJobke merged commit 77b58ae into stable12Dec 11, 2017
@MorrisJobke
MorrisJobke deleted the 12_7230 branch December 11, 2017 21:45
@MorrisJobkeMorrisJobke mentioned this pull request Jan 8, 2018
Merged
13 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst approved these changes
@danxuliudanxuliudanxuliu approved these changes
@MorrisJobkeMorrisJobkeAwaiting requested review from MorrisJobke
@icewind1991icewind1991Awaiting requested review from icewind1991
@blizzzblizzzAwaiting requested review from blizzz

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

Nextcloud 12.0.5

Development

Successfully merging this pull request may close these issues.

4 participants

@rullzer@ChristophWurst@danxuliu@MorrisJobke