Skip to content
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

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

Merged
merged 1 commit into from
Jan 24, 2018

Conversation

MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke commented Jan 24, 2018

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>
@MorrisJobke MorrisJobke added the 3. to review Waiting for reviews label Jan 24, 2018
@MorrisJobke MorrisJobke added this to the Nextcloud 13 milestone Jan 24, 2018
@MorrisJobke
Copy link
Member Author

I tested it again and it works fine on stable13.

@MorrisJobke MorrisJobke mentioned this pull request Jan 24, 2018
5 tasks
@rullzer
Copy link
Member

rullzer commented Jan 24, 2018

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

@codecov
Copy link

codecov bot commented Jan 24, 2018

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 Files Coverage Δ 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 stable13 Jan 24, 2018
@MorrisJobke MorrisJobke deleted the 13-7991 branch January 24, 2018 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants