diff --git a/config/version.php b/config/version.php index 65fa04497..6fbf00532 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ 'Public GitHub', 'api_url' => 'https://api.github.com', diff --git a/database/seeders/GitlabAppSeeder.php b/database/seeders/GitlabAppSeeder.php index 77bd5c419..bf1833ae4 100644 --- a/database/seeders/GitlabAppSeeder.php +++ b/database/seeders/GitlabAppSeeder.php @@ -16,7 +16,7 @@ class GitlabAppSeeder extends Seeder public function run(): void { $root_team = Team::find(0); - $private_key_3 = PrivateKey::find(3); + $private_key_2 = PrivateKey::find(2); GitlabApp::create([ 'id' => 1, 'name' => 'Public GitLab', @@ -36,7 +36,7 @@ public function run(): void 'deploy_key_id' => '1234', 'public_key' => 'dfjasiourj', 'webhook_token' => '4u3928u4y392', - 'private_key_id' => $private_key_3->id, + 'private_key_id' => $private_key_2->id, 'team_id' => $root_team->id, ]); } diff --git a/database/seeders/PrivateKeySeeder.php b/database/seeders/PrivateKeySeeder.php index 9078d1bc7..52785f164 100644 --- a/database/seeders/PrivateKeySeeder.php +++ b/database/seeders/PrivateKeySeeder.php @@ -17,6 +17,7 @@ public function run(): void { $team_1 = Team::find(0); PrivateKey::create([ + "id" => 0, "team_id" => $team_1->id, "name" => "Testing-host", "description" => "This is a test docker container", diff --git a/database/seeders/ServerSeeder.php b/database/seeders/ServerSeeder.php index a557a8187..10a4a9c1d 100644 --- a/database/seeders/ServerSeeder.php +++ b/database/seeders/ServerSeeder.php @@ -16,7 +16,7 @@ class ServerSeeder extends Seeder public function run(): void { $root_team = Team::find(0); - $private_key_1 = PrivateKey::find(1); + $private_key_1 = PrivateKey::find(0); Server::create([ 'id' => 0, diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index 9e0372c02..d6d02489f 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -1,20 +1,21 @@ -
+
+

General

- Save + @if ($server->id === 0) + Save + @else + Save + @endif
- @if ($server->id === 0) - - - @else - - - @endif + + @@ -23,16 +24,14 @@
@if ($server->id === 0) - - - + @else -
- - -
@endif +
+ + +

Actions

diff --git a/versions.json b/versions.json index 3917ad027..a240096ab 100644 --- a/versions.json +++ b/versions.json @@ -4,7 +4,7 @@ "version": "3.12.32" }, "v4": { - "version": "4.0.0-beta.5" + "version": "4.0.0-beta.6" } } -} +} \ No newline at end of file