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

Merge branch 'master' into feature/families-for-enterprise

Browse Source
This commit is contained in:
Justin Baur
2021-11-12 22:33:58 -05:00
committed by GitHub
parent dba01a2c4e f1c41257b3
commit 252b558fe1
90 changed files with 3974 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/PostgresMigrations/Migrations/20211011145128_SplitManageCollectionsPermissions2.cs
View File

@ -7,7 +7,7 @@ namespace Bit.PostgresMigrations.Migrations
public partial class SplitManageCollectionsPermissions2 : Migration
{
private const string _scriptLocation =
"PostgresMigration.Scripts.2021-09-21_01_SplitManageCollectionsPermission.psql";
"PostgresMigrations.Scripts.2021-09-21_01_SplitManageCollectionsPermission.psql";
protected override void Up(MigrationBuilder migrationBuilder)
{

2
util/PostgresMigrations/Migrations/20211021204521_SetMaxAutoscaleSeatsToCurrentSeatCount.cs
View File

@ -7,7 +7,7 @@ namespace Bit.PostgresMigrations.Migrations
public partial class SetMaxAutoscaleSeatsToCurrentSeatCount : Migration
{
private const string _scriptLocation =
"PostgresMigration.Scripts.2021-10-21_00_SetMaxAutoscaleSeatCount.sql";
"PostgresMigrations.Scripts.2021-10-21_00_SetMaxAutoscaleSeatCount.psql";
protected override void Up(MigrationBuilder migrationBuilder)
{

1504
util/PostgresMigrations/Migrations/20211108041547_KeyConnector.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

24
util/PostgresMigrations/Migrations/20211108041547_KeyConnector.cs Normal file
View File

@ -0,0 +1,24 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace Bit.PostgresMigrations.Migrations
{
public partial class KeyConnector : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "UsesKeyConnector",
table: "User",
type: "boolean",
nullable: false,
defaultValue: false);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "UsesKeyConnector",
table: "User");
}
}
}

2
util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs
View File

@ -1187,7 +1187,7 @@ namespace Bit.PostgresMigrations.Migrations
.HasMaxLength(32)
.HasColumnType("character varying(32)");
b.Property<bool>("UsesCryptoAgent")
b.Property<bool>("UsesKeyConnector")
.HasColumnType("boolean");
b.HasKey("Id");