summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-03 11:35:16 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-03 11:35:16 +0100
commita66a57585950dca3264954c4f31dff6f735c905b (patch)
treed984ab6322437fadd7469a4dfb14e4b42cb9afe7 /core
parentd66a836251c6c17b31331f2a2816d5ccb059997d (diff)
parent2e444e6e372d1370be46966e800aca073540a77f (diff)
downloadnextcloud-server-a66a57585950dca3264954c4f31dff6f735c905b.tar.gz
nextcloud-server-a66a57585950dca3264954c4f31dff6f735c905b.zip
Merge pull request #22090 from owncloud/skip-migration-tests-setting
setting to skip migration tests by default
Diffstat (limited to 'core')
-rw-r--r--core/ajax/update.php6
-rw-r--r--core/command/upgrade.php6
2 files changed, 12 insertions, 0 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 4d8fe19f168..15daff4e1de 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -50,6 +50,12 @@ if (OC::checkUpgrade(false)) {
\OC::$server->getIntegrityCodeChecker(),
$logger
);
+
+ if ($config->getSystemValue('update.skip-migration-test', false)) {
+ $eventSource->send('success', (string)$l->t('Migration tests are skipped - "update.skip-migration-test" is activated in config.php'));
+ $updater->setSimulateStepEnabled(false);
+ }
+
$incompatibleApps = [];
$disabledThirdPartyApps = [];
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index c45984d7a30..2123efdfd38 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -99,6 +99,12 @@ class Upgrade extends Command {
$updateStepEnabled = true;
$skip3rdPartyAppsDisable = false;
+ if ($this->config->getSystemValue('update.skip-migration-test', false)) {
+ $output->writeln(
+ '<info>"skip-migration-test" is activated via config.php</info>'
+ );
+ $simulateStepEnabled = false;
+ }
if ($input->getOption('skip-migration-test')) {
$simulateStepEnabled = false;
}