Merge pull request coollabsio#3404 from coollabsio/next

andrasbacsai · web-flow · commit 8bc22e185b51 · 2024-09-12T10:34:51.000+02:00
fixes for 334
diff --git a/app/Models/Service.php b/app/Models/Service.php
@@ -667,7 +667,7 @@ public function extraFields()
                     }
                     $data = $data->merge([
                         'Root User' => [
-                            'key' => 'N/A',
+                            'key' => 'GITLAB_ROOT_USER',
                             'value' => 'root',
                             'rules' => 'required',
                             'isPassword' => true,
diff --git a/composer.json b/composer.json
@@ -48,7 +48,6 @@
         "zircote/swagger-php": "^4.10"
     },
     "require-dev": {
-        "itsgoingd/clockwork": "^5.2",
         "fakerphp/faker": "^v1.21.0",
         "laravel/dusk": "^v8.0",
         "laravel/pint": "^1.16",
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,7 @@ public function extraFields()`
`667`	`667`	`}`
`668`	`668`	`$data = $data->merge([`
`669`	`669`	`'Root User' => [`
`670`		`- 'key' => 'N/A',`
	`670`	`+ 'key' => 'GITLAB_ROOT_USER',`
`671`	`671`	`'value' => 'root',`
`672`	`672`	`'rules' => 'required',`
`673`	`673`	`'isPassword' => true,`