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] Remove wrong entry in admin_settings that causes 500 #7455

Merged
merged 1 commit into from Dec 11, 2017

Conversation

@rullzer
Member

rullzer commented Dec 11, 2017

Backport of #7230

Remove wrong entry in admin_settings that causes 500
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@ChristophWurst

Looks good

@codecov

This comment has been minimized.

codecov bot commented Dec 11, 2017

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 Files Coverage Δ Complexity Δ
lib/private/Settings/Manager.php 43.37% <0%> (-0.8%) 45 <0> (+1)
core/js/js.js 61.83% <0%> (+0.55%) 0% <0%> (ø) ⬇️
apps/files_trashbin/lib/Expiration.php 91.93% <0%> (+1.61%) 29% <0%> (ø) ⬇️
@danxuliu

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

@MorrisJobke MorrisJobke merged commit 77b58ae into stable12 Dec 11, 2017

2 of 3 checks passed

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

@MorrisJobke MorrisJobke deleted the 12_7230 branch Dec 11, 2017

@MorrisJobke MorrisJobke referenced this pull request Jan 8, 2018

Merged

12.0.5 RC1 #7740

13 of 13 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment