Skip to content

Commit

Permalink
馃摉 replace any support.ghost.org link (#8555)
Browse files Browse the repository at this point in the history
refs #7421
  • Loading branch information
kirrg001 authored and kevinansfield committed Jun 8, 2017
1 parent ce7d731 commit f5ef8db
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion core/server/admin/controller.js
Expand Up @@ -27,7 +27,7 @@ module.exports = function adminController(req, res) {
location: 'upgrade.new-version-available',
dismissible: false,
message: i18n.t('notices.controllers.newVersionAvailable',
{version: updateVersion, link: '<a href="http://support.ghost.org/how-to-upgrade/" target="_blank">Click here</a>'})};
{version: updateVersion, link: '<a href="https://docs.ghost.org/v1.0.0/docs/installing-ghost-via-the-cli" target="_blank">Click here</a>'})};

return api.notifications.browse({context: {internal: true}}).then(function then(results) {
if (!_.some(results.notifications, {message: notification.message})) {
Expand Down
2 changes: 1 addition & 1 deletion core/server/api/authentication.js
Expand Up @@ -536,7 +536,7 @@ authentication = {
logging.error(new errors.EmailError({
err: error,
context: i18n.t('errors.api.authentication.unableToSendWelcomeEmail'),
help: i18n.t('errors.api.authentication.checkEmailConfigInstructions', {url: 'http://support.ghost.org/mail/'})
help: i18n.t('errors.api.authentication.checkEmailConfigInstructions', {url: 'http://docs.ghost.org/v1.0.0/docs/mail-configuration-on-self-hosted-version-of-ghost'})
}));
});
})
Expand Down
2 changes: 1 addition & 1 deletion core/server/api/mail.js
Expand Up @@ -29,7 +29,7 @@ function sendMail(object) {
message: [
i18n.t('warnings.index.unableToSendEmail'),
i18n.t('common.seeLinkForInstructions',
{link: '<a href=\'http://support.ghost.org/mail\' target=\'_blank\'>http://support.ghost.org/mail</a>'})
{link: '<a href=\'https://docs.ghost.org/v1.0.0/docs/mail-configuration-on-self-hosted-version-of-ghost\' target=\'_blank\'>Checkout our mail configuration docs!</a>'})
].join(' ')
}]},
{context: {internal: true}}
Expand Down
2 changes: 1 addition & 1 deletion core/server/apps/subscribers/lib/helpers/index.js
Expand Up @@ -12,7 +12,7 @@ module.exports = function registerHelpers(ghost) {
flagKey: 'subscribers',
flagName: 'Subscribers',
helperName: 'subscribe_form',
helpUrl: 'http://support.ghost.org/subscribers-beta/'
helpUrl: 'https://help.ghost.org/hc/en-us/articles/224089787-Subscribers-Beta'
}, function executeHelper() {
return require('./subscribe_form').apply(self, args);
});
Expand Down
4 changes: 2 additions & 2 deletions core/server/data/db/health.js
Expand Up @@ -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 Alpha (master branch)',
message: 'Your database version is not compatible with Ghost 1.0.0 Beta (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://support.ghost.org/v1-0-alpha'
help: 'More information on the Ghost 1.0.0 Alpha at https://docs.ghost.org/v1.0.0/docs/alpha-and-beta-versions'
});
})
.catch(function (err) {
Expand Down
2 changes: 1 addition & 1 deletion core/server/data/slack/index.js
Expand Up @@ -36,7 +36,7 @@ function makeRequest(reqOptions, reqPayload) {
logging.error(new errors.GhostError({
err: err,
context: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.error'),
help: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.help', {url: 'http://support.ghost.org'})
help: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.help', {url: 'http://docs.ghost.org'})
}));
});

Expand Down
2 changes: 1 addition & 1 deletion core/server/data/xml/xmlrpc.js
Expand Up @@ -82,7 +82,7 @@ function ping(post) {
err: err,
message: err.message,
context: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.error'),
help: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.help', {url: 'http://support.ghost.org'})
help: i18n.t('errors.data.xml.xmlrpc.pingUpdateFailed.help', {url: 'http://docs.ghost.org'})
}));
});

Expand Down
2 changes: 1 addition & 1 deletion core/server/helpers/get.js
Expand Up @@ -149,7 +149,7 @@ module.exports = function getLabsWrapper() {
flagKey: 'publicAPI',
flagName: 'Public API',
helperName: 'get',
helpUrl: 'http://support.ghost.org/public-api-beta/',
helpUrl: 'https://help.ghost.org/hc/en-us/articles/115000301672-Public-API-Beta',
async: true
}, function executeHelper() {
return get.apply(self, args);
Expand Down
2 changes: 1 addition & 1 deletion core/server/update-check.js
Expand Up @@ -47,7 +47,7 @@ function updateCheckError(err) {
);

err.context = i18n.t('errors.update-check.checkingForUpdatesFailed.error');
err.help = i18n.t('errors.update-check.checkingForUpdatesFailed.help', {url: 'http://support.ghost.org'});
err.help = i18n.t('errors.update-check.checkingForUpdatesFailed.help', {url: 'https://docs.ghost.org/v1.0.0'});
logging.error(err);
}

Expand Down
9 changes: 7 additions & 2 deletions core/test/unit/server_helpers/get_spec.js
Expand Up @@ -2,8 +2,9 @@ var should = require('should'),
sinon = require('sinon'),
Promise = require('bluebird'),

// Stuff we are testing
// Stuff we are testing
helpers = require('../../../server/helpers'),
models = require('../../../server/models'),
api = require('../../../server/api'),

labs = require('../../../server/utils/labs'),
Expand All @@ -13,6 +14,10 @@ var should = require('should'),
describe('{{#get}} helper', function () {
var fn, inverse, labsStub;

before(function () {
models.init();
});

beforeEach(function () {
fn = sandbox.spy();
inverse = sandbox.spy();
Expand Down Expand Up @@ -41,7 +46,7 @@ describe('{{#get}} helper', function () {
'string',
'<script>console.error("The {{get}} helper is not available. ' +
'The Public API labs flag must be enabled if you wish to use the {{get}} helper. ' +
'See http://support.ghost.org/public-api-beta/");</script>'
'See https://help.ghost.org/hc/en-us/articles/115000301672-Public-API-Beta");</script>'
);

done();
Expand Down

0 comments on commit f5ef8db

Please sign in to comment.