nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 16:12:49 -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

30
test/Api.Test/packages.lock.json
View File

@ -3015,25 +3015,25 @@
"AspNetCore.HealthChecks.SqlServer": "[6.0.2, )",
"AspNetCore.HealthChecks.Uris": "[6.0.3, )",
"Azure.Messaging.EventGrid": "[4.10.0, )",
"Commercial.Core": "[2023.9.0, )",
"Commercial.Infrastructure.EntityFramework": "[2023.9.0, )",
"Core": "[2023.9.0, )",
"SharedWeb": "[2023.9.0, )",
"Commercial.Core": "[2023.10.0, )",
"Commercial.Infrastructure.EntityFramework": "[2023.10.0, )",
"Core": "[2023.10.0, )",
"SharedWeb": "[2023.10.0, )",
"Swashbuckle.AspNetCore": "[6.5.0, )"
}
},
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "[2023.9.0, )"
"Core": "[2023.10.0, )"
}
},
"commercial.infrastructure.entityframework": {
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.9.0, )"
"Core": "[2023.10.0, )",
"Infrastructure.EntityFramework": "[2023.10.0, )"
}
},
"common": {
@ -3041,7 +3041,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, )",
@ -3095,8 +3095,8 @@
"dependencies": {
"AutoFixture.AutoNSubstitute": "[4.17.0, )",
"AutoFixture.Xunit2": "[4.17.0, )",
"Common": "[2023.9.0, )",
"Core": "[2023.9.0, )",
"Common": "[2023.10.0, )",
"Core": "[2023.10.0, )",
"Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )",
"Microsoft.NET.Test.Sdk": "[17.1.0, )",
"NSubstitute": "[4.3.0, )",
@ -3106,7 +3106,7 @@
"infrastructure.dapper": {
"type": "Project",
"dependencies": {
"Core": "[2023.9.0, )",
"Core": "[2023.10.0, )",
"Dapper": "[2.0.123, )"
}
},
@ -3114,7 +3114,7 @@
"type": "Project",
"dependencies": {
"AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )",
"Core": "[2023.9.0, )",
"Core": "[2023.10.0, )",
"Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )",
"Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )",
@ -3126,9 +3126,9 @@
"sharedweb": {
"type": "Project",
"dependencies": {
"Core": "[2023.9.0, )",
"Infrastructure.Dapper": "[2023.9.0, )",
"Infrastructure.EntityFramework": "[2023.9.0, )"
"Core": "[2023.10.0, )",
"Infrastructure.Dapper": "[2023.10.0, )",
"Infrastructure.EntityFramework": "[2023.10.0, )"
}
}
}