Merge branch 'trunk'

app/Http/Requests/Bo/Users/StoreUserRequest.php

@@ -19,6 +19,18 @@ class StoreUserRequest extends FormRequest
         return Gate::allows('isAdmin');
     }
 
+    /**
+     * Prepare the data for validation.
+     *
+     * @return void
+     */
+    protected function prepareForValidation(): void
+    {
+        $this->merge([
+            'gitlab_id' => \boolval($this->input('gitlab_id')) ? $this->input('gitlab_id') : null
+        ]);
+    }
+
     /**
      * Get the validation rules that apply to the request.
      *

app/Http/Requests/Bo/Users/UpdateUserRequest.php

@@ -12,7 +12,8 @@ class UpdateUserRequest extends StoreUserRequest
     public function rules()
     {
         return array_merge(parent::rules(), [
-            'email' => 'email|required|unique:users,email,' . $this->route('user')->id . ',id',
+            'email'     => 'email|required|unique:users,email,' . $this->route('user')->id . ',id',
+            'gitlab_id' => 'nullable|integer|unique:users,gitlab_id,' . $this->route('user')->id . ',id'
         ]);
     }
 }