Skip to content

Commit 5e712f0

Browse files
committed
Merge branch 'develop' into feature/service-export-import
2 parents 9161910 + b3fdf64 commit 5e712f0

File tree

7 files changed

+4
-15
lines changed

7 files changed

+4
-15
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
2727
* Using default value in rules when creating a new variable if the rules is empty.
2828
* Fixes a design-flaw in the allocation management part of nodes that would run a MySQL query for each port being allocated. This behavior is now changed to only execute one query to add multiple ports at once.
2929
* Attempting to create a server when no nodes are configured now redirects to the node creation page.
30+
* Fixes missing library issue for teamspeak when used with mariadb.
3031

3132
## v0.6.4 (Courageous Carniadactylus)
3233
### Fixed

app/Console/Commands/Environment/AppSettingsCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ public function handle()
115115
$this->checkForRedis();
116116
$this->writeToEnvironment($this->variables);
117117

118-
$this->command->call('config:cache');
119118
$this->info($this->command->output());
120119
}
121120

app/Console/Commands/Environment/DatabaseSettingsCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ public function handle()
122122

123123
$this->writeToEnvironment($this->variables);
124124

125-
$this->console->call('config:cache');
126125
$this->info($this->console->output());
127126

128127
return 0;

app/Console/Commands/Environment/EmailSettingsCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ public function handle()
9292
$this->writeToEnvironment($this->variables);
9393

9494
$this->line('Updating stored environment configuration file.');
95-
$this->call('config:cache');
9695
$this->line('');
9796
}
9897

app/Http/Controllers/Admin/UserController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function delete(Request $request, User $user)
131131

132132
$this->deletionService->handle($user);
133133

134-
return redirect()->route('admin.users.view', $user->id);
134+
return redirect()->route('admin.users');
135135
}
136136

137137
/**

composer.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,13 @@
6868
}
6969
},
7070
"scripts": {
71-
"pre-install-cmd": [
72-
"rm -f bootstrap/cache/services.php bootstrap/cache/compiled.php"
73-
],
74-
"pre-update-cmd": [
75-
"rm -f bootstrap/cache/services.php bootstrap/cache/compiled.php"
76-
],
7771
"post-install-cmd": [
7872
"Illuminate\\Foundation\\ComposerScripts::postInstall",
79-
"php artisan optimize",
80-
"php artisan config:cache"
73+
"php artisan optimize"
8174
],
8275
"post-update-cmd": [
8376
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
84-
"php artisan optimize",
85-
"php artisan config:cache"
77+
"php artisan optimize"
8678
]
8779
},
8880
"prefer-stable": true,

tests/Unit/Commands/Environment/EmailSettingsCommandTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,5 @@ private function setupCoreFunctions(array $data)
276276
{
277277
$this->config->shouldReceive('get')->withAnyArgs()->zeroOrMoreTimes()->andReturnNull();
278278
$this->command->shouldReceive('writeToEnvironment')->with($data)->once()->andReturnNull();
279-
$this->command->shouldReceive('call')->with('config:cache')->once()->andReturnNull();
280279
}
281280
}

0 commit comments

Comments
 (0)