From 97ba6261a8eb7f94963ecc91043e5a2d54ffd248 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 15 May 2021 21:33:43 +0200 Subject: git update auto change to edge branch (#3589) * git update auto change to edge branch For existing installations using automatic git update, checkout *edge* branch if it was still using *master* or *dev*. * One more prune * Fix several small issues * theirs does not work here * Use migration mechanism * Better handling of Migration errors * Test details * Fix tests * Do not use new migration system for now --- lib/Minz/Migrator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Minz/Migrator.php') diff --git a/lib/Minz/Migrator.php b/lib/Minz/Migrator.php index f6e9f8298..eac1bac5b 100644 --- a/lib/Minz/Migrator.php +++ b/lib/Minz/Migrator.php @@ -103,7 +103,7 @@ class Minz_Migrator if (!$migrator->upToDate()) { // still not up to date? It means last migration failed. - return 'A migration failed to be applied, please see previous logs'; + return trim('A migration failed to be applied, please see previous logs.' . "\n" . implode("\n", $results)); } return true; -- cgit v1.2.3