nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 09:32:48 -05:00
Code Activity

Merge branch 'master' into flexible-collections/deprecate-custom-collection-perm

Browse Source 
# Conflicts:
#	src/Api/Controllers/CollectionsController.cs
#	src/Api/Utilities/ServiceCollectionExtensions.cs
#	src/Api/Vault/AuthorizationHandlers/Collections/CollectionAuthorizationHandler.cs
#	src/Api/Vault/AuthorizationHandlers/Collections/CollectionOperations.cs
#	src/Core/Context/CurrentContext.cs
#	src/Core/Services/Implementations/CollectionService.cs
#	src/Core/Services/Implementations/OrganizationService.cs
#	test/Api.Test/Controllers/CollectionsControllerTests.cs
#	test/Api.Test/Vault/AuthorizationHandlers/CollectionAuthorizationHandlerTests.cs
#	test/Core.Test/Services/CollectionServiceTests.cs
This commit is contained in:
Rui Tome
2023-11-01 12:05:19 +00:00
parent 080d1088c4 da4a86c643
commit db19d143ed
36 changed files with 216 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Core.Test/packages.lock.json
View File

@ -2673,7 +2673,7 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
"Core": "[2023.9.0, )",
"Core": "[2023.10.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",