yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/websecurity

Browse Source 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Web/Editors/AuthenticationController.cs
This commit is contained in:
Bjarke Berg
2020-06-10 11:10:48 +02:00
parent d682bc9903 57a087861c
commit 9f17049582
110 changed files with 1945 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.Common/Install/InstallApiController.cs
View File

@@ -24,7 +24,7 @@ namespace Umbraco.Web.Common.Install
[UmbracoApiController]
[TypeFilter(typeof(HttpResponseExceptionFilter))]
[TypeFilter(typeof(AngularJsonOnlyConfigurationAttribute))]
[AngularJsonOnlyConfiguration]
[InstallAuthorize]
[Area(Umbraco.Core.Constants.Web.Mvc.InstallArea)]
public class InstallApiController : ControllerBase
@@ -106,7 +106,7 @@ namespace Umbraco.Web.Common.Install
/// <summary>
/// Installs.
/// </summary>
/// </summary>
public async Task<InstallProgressResultModel> PostPerformInstall(InstallInstructions installModel)
{
if (installModel == null) throw new ArgumentNullException(nameof(installModel));