From 89ef60fdba86c16a14b149c506707ede9e20daa8 Mon Sep 17 00:00:00 2001 From: Katharina Irrgang Date: Mon, 23 Jan 2017 12:32:17 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=20=20knex-migrator=201.0.0=20(#787?= =?UTF-8?q?3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refs #7489 Most important change is the naming of the knex-migrator config file. --- .knex-migrator => MigratorConfig.js | 4 +--- index.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) rename .knex-migrator => MigratorConfig.js (92%) diff --git a/.knex-migrator b/MigratorConfig.js similarity index 92% rename from .knex-migrator rename to MigratorConfig.js index a3efe427f0..475ec77750 100644 --- a/.knex-migrator +++ b/MigratorConfig.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - var config = require('./core/server/config'), versioning = require('./core/server/data/schema/versioning'); @@ -7,4 +5,4 @@ module.exports = { currentVersion: versioning.getNewestDatabaseVersion(), database: config.get('database'), migrationPath: config.get('paths:migrationPath') -} +}; diff --git a/index.js b/index.js index 2ba6e4db53..795c36be20 100644 --- a/index.js +++ b/index.js @@ -23,7 +23,7 @@ ghost().then(function (ghostServer) { } }); }).catch(function (error) { - if (!(error instanceof errors.GhostError)) { + if (!(error instanceof errors.IgnitionError)) { error = new errors.GhostError({err: error}); } diff --git a/package.json b/package.json index 4dc772c157..87c735d0da 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "intl-messageformat": "1.3.0", "jsonpath": "0.2.9", "knex": "0.12.5", - "knex-migrator": "0.2.0", + "knex-migrator": "1.0.0", "lodash": "4.17.4", "mobiledoc-html-renderer": "0.3.1", "moment": "2.17.1",