Merge branch 'develop' into feature/client-api

This commit is contained in:
Dane Everitt 2018-02-27 19:49:06 -06:00
commit d4e331c20a
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
13 changed files with 106 additions and 28 deletions

View file

@ -121,6 +121,7 @@ class User extends Model implements
* @var array
*/
protected $attributes = [
'external_id' => null,
'root_admin' => false,
'language' => 'en',
'use_totp' => false,

View file

@ -66,7 +66,7 @@ class ReinstallServerService
$this->database->beginTransaction();
$this->repository->withoutFreshModel()->update($server->id, [
'installed' => 0,
]);
], true, true);
try {
$this->daemonServerRepository->setServer($server)->reinstall();