Merge remote-tracking branch 'origin/v8/8.17' into v9/feature/merge_v8_14092021

Browse Source

# Conflicts:
#	src/Umbraco.Core/ConfigsExtensions.cs
#	src/Umbraco.Core/Configuration/CoreDebug.cs
#	src/Umbraco.Core/Scoping/ScopeProvider.cs
#	src/Umbraco.Infrastructure/Scoping/Scope.cs
#	src/Umbraco.PublishedCache.NuCache/ContentStore.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Scoping/ScopeUnitTests.cs
#	src/Umbraco.Tests/Components/ComponentTests.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web/HealthCheck/Checks/Security/BaseHttpHeaderCheck.cs

...

This commit is contained in:

Bjarke Berg

2021-09-14 11:32:43 +02:00

parent cafbe89f61 c6a1765c95

commit f3096c99da

11 changed files with 1104 additions and 622 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

756

src/Umbraco.Web.UI.Client/package-lock.json generated

File diff suppressed because it is too large Load Diff