From 35f12273ee450b2e2046fb0acb66c32bc4e75688 Mon Sep 17 00:00:00 2001 From: Katharina Irrgang Date: Tue, 11 Jul 2017 15:05:55 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20=20remove=20beta=20mentioning's?= =?UTF-8?q?=20(#8673)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit no issue - preparation for rc.1 --- core/server/data/db/health.js | 4 ++-- core/server/ghost-server.js | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/core/server/data/db/health.js b/core/server/data/db/health.js index 2c51b21958..ff8dc3a3d0 100644 --- a/core/server/data/db/health.js +++ b/core/server/data/db/health.js @@ -23,9 +23,9 @@ module.exports.check = function healthCheck() { } throw new errors.DatabaseVersionError({ - message: 'Your database version is not compatible with Ghost 1.0.0 Beta (master branch)', + message: 'Your database version is not compatible with Ghost 1.0.0 (master branch)', context: 'Want to keep your DB? Use Ghost < 1.0.0 or the "stable" branch. Otherwise please delete your DB and restart Ghost.', - help: 'More information on the Ghost 1.0.0 Alpha at https://docs.ghost.org/v1.0.0/docs/alpha-and-beta-versions' + help: 'More information on the Ghost 1.0.0 at https://docs.ghost.org/docs/introduction' }); }) .catch(function (err) { diff --git a/core/server/ghost-server.js b/core/server/ghost-server.js index 59df2e86ec..b7e2847aff 100644 --- a/core/server/ghost-server.js +++ b/core/server/ghost-server.js @@ -2,7 +2,6 @@ // Handles the creation of an HTTP Server for Ghost var debug = require('debug')('ghost:server'), Promise = require('bluebird'), - chalk = require('chalk'), fs = require('fs'), path = require('path'), _ = require('lodash'), @@ -193,14 +192,10 @@ GhostServer.prototype.closeConnections = function () { GhostServer.prototype.logStartMessages = function () { // Startup & Shutdown messages if (config.get('env') === 'production') { - logging.error('\nCurrently running Ghost 1.0.0 Beta, this is NOT suitable for production!\n' + - chalk.white('Please switch to the stable branch. \n') + - chalk.white('More information on the Ghost 1.0.0 Beta at: ') + chalk.cyan('https://dev.ghost.org/1-0-0-beta') + '\n' - ); - + logging.info(i18n.t('notices.httpServer.ghostIsRunningIn', {env: config.get('env')})); + logging.info(i18n.t('notices.httpServer.yourBlogIsAvailableOn', {url: utils.url.urlFor('home', true)})); logging.info(i18n.t('notices.httpServer.ctrlCToShutDown')); } else { - logging.warn('Welcome to the Ghost 1.0.0 Beta - this version of Ghost is for development only.'); logging.info(i18n.t('notices.httpServer.ghostIsRunningIn', {env: config.get('env')})); logging.info(i18n.t('notices.httpServer.listeningOn', { host: config.get('server').socket || config.get('server').host,