Skip to content

[stable13] Send a proper response for status.php on trusted domain error - #8029

Merged
MorrisJobke merged 1 commit into
stable13from
13-7991
Jan 24, 2018
Merged

[stable13] Send a proper response for status.php on trusted domain error#8029
MorrisJobke merged 1 commit into
stable13from
13-7991

Conversation

@MorrisJobke

@MorrisJobkeMorrisJobke commented Jan 24, 2018

Copy link
Copy Markdown
Member

I would like to get this in 13. Usually it happens anyways only during installation time and thus backporting to stable12 makes not much sense in my opinion.

@rullzer@nickvergessen Are you fine with 13.0.0 or should it go into 13.0.1?

* fixes#7732
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobkeMorrisJobke added the 3. to review Waiting for reviews label Jan 24, 2018
@MorrisJobkeMorrisJobke added this to the Nextcloud 13 milestone Jan 24, 2018
@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

I tested it again and it works fine on stable13.

@MorrisJobkeMorrisJobke mentioned this pull request Jan 24, 2018
5 tasks
@rullzer

Copy link
Copy Markdown
Member

if we are doing an RC3 that has ~a week to test I'm fine with 13.0.0

@codecov

codecovBot commented Jan 24, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8029 into stable13 will increase coverage by 0.16%.
The diff coverage is n/a.

@@ Coverage Diff @@## stable13 #8029 +/- ##
=============================================
+ Coverage 51.23% 51.4% +0.16% + Complexity 24976 24974 -2 
=============================================
Files 1607 1599 -8 Lines 95034 94709 -325 Branches 1376 1376 =============================================
- Hits 48691 48681 -10 + Misses 46343 46028 -315
Impacted FilesCoverage ΔComplexity Δ
lib/public/Util.php
lib/private/Diagnostics/EventLogger.php
lib/private/legacy/template/functions.php
settings/ajax/uninstallapp.php
lib/private/Migration/BackgroundRepair.php
lib/private/User/Session.php
.../public/AppFramework/Http/DataDownloadResponse.php
apps/sharebymail/appinfo/app.php
...s_sharing/lib/Middleware/OCSShareAPIMiddleware.php
core/js/setupchecks.js
... and 3195 more

@MorrisJobke
MorrisJobke merged commit 76636de into stable13Jan 24, 2018
@MorrisJobke
MorrisJobke deleted the 13-7991 branch January 24, 2018 15:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MorrisJobke@rullzer