From a40dd04c1bfc0fb0dd5edf4eb9ebe7781f500008 Mon Sep 17 00:00:00 2001 From: Kim Gardner Date: Wed, 7 Jun 2017 19:10:13 -0400 Subject: [PATCH 1/3] Update version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 766aff70c..23d802201 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "talk", - "version": "1.8.0", + "version": "1.9.0", "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net", "main": "app.js", "scripts": { From 3a285d92a5cc889cb802abd3e43470d80ecc3710 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Thu, 8 Jun 2017 09:10:53 -0600 Subject: [PATCH 2/3] Added more warnings --- bin/cli-migration | 17 +++++++++++++++-- plugins.default.json | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/bin/cli-migration b/bin/cli-migration index 9c3e077b1..83a84e29d 100755 --- a/bin/cli-migration +++ b/bin/cli-migration @@ -41,7 +41,20 @@ async function runMigrations() { console.log(`\tmigrations/${filename}`); } - let answers = await inquirer.prompt([ + let {backedUp} = await inquirer.prompt([ + { + type: 'confirm', + name: 'backedUp', + message: 'Did you perform a database backup', + default: false + } + ]); + + if (!backedUp) { + throw new Error('Please backup your databases prior to migrations occuring'); + } + + let {confirm} = await inquirer.prompt([ { type: 'confirm', name: 'confirm', @@ -50,7 +63,7 @@ async function runMigrations() { } ]); - if (answers.confirm) { + if (confirm) { // Run the migrations. await MigrationService.run(migrations); diff --git a/plugins.default.json b/plugins.default.json index 753eb9000..2fb3aaa21 100644 --- a/plugins.default.json +++ b/plugins.default.json @@ -4,7 +4,7 @@ "coral-plugin-like", "coral-plugin-respect", "coral-plugin-offtopic", - "coral-plugin-facebook-auth", + "coral-plugin-facebook-auth" ], "client": [ "coral-plugin-respect", From 480bab3c1a170b5d882f39812f493b9ff03ee227 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Thu, 8 Jun 2017 09:12:08 -0600 Subject: [PATCH 3/3] changed some text around --- bin/cli-migration | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/cli-migration b/bin/cli-migration index 83a84e29d..036ac8b02 100755 --- a/bin/cli-migration +++ b/bin/cli-migration @@ -32,15 +32,6 @@ async function runMigrations() { try { - // Get the migrations to run. - let migrations = await MigrationService.listPending(); - - console.log('Now going to run the following migrations:\n'); - - for (let {filename} of migrations) { - console.log(`\tmigrations/${filename}`); - } - let {backedUp} = await inquirer.prompt([ { type: 'confirm', @@ -54,6 +45,15 @@ async function runMigrations() { throw new Error('Please backup your databases prior to migrations occuring'); } + // Get the migrations to run. + let migrations = await MigrationService.listPending(); + + console.log('Now going to run the following migrations:\n'); + + for (let {filename} of migrations) { + console.log(`\tmigrations/${filename}`); + } + let {confirm} = await inquirer.prompt([ { type: 'confirm',