Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Cleanup indentation now JSCS can see it

Browse source 
- this is needed to make #6925 mergable
This commit is contained in:
Hannah Wolfe 2016-06-11 20:25:15 +01:00
parent f6ba114728
commit 6bcc08e874
4 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/server/api/authentication.js
View file

@ -377,13 +377,15 @@ authentication = {
}
function formatResponse(isSetup) {
return {setup: [{
status: isSetup,
// Pre-populate from config if, and only if the values exist in config.
title: config.title || undefined,
name: config.user_name || undefined,
email: config.user_email || undefined
}]};
return {setup: [
{
status: isSetup,
// Pre-populate from config if, and only if the values exist in config.
title: config.title || undefined,
name: config.user_name || undefined,
email: config.user_email || undefined
}
]};
}
tasks = [

19
core/server/api/mail.js
View file

@ -34,14 +34,17 @@ function sendMail(object) {
return mailer.send(object.mail[0].message).catch(function (err) {
if (mailer.state.usingDirect) {
notifications.add({notifications: [{
type: 'warn',
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>'})
].join(' ')
}]}, {context: {internal: true}});
notifications.add(
{notifications: [{
type: 'warn',
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>'})
].join(' ')
}]},
{context: {internal: true}}
);
}
return Promise.reject(new errors.EmailError(err.message));

2
core/test/integration/api/api_posts_spec.js
View file

@ -1,4 +1,4 @@
/*globals describe, before, beforeEach, afterEach, it */
/*globals describe, before, beforeEach, afterEach, it */
var testUtils = require('../../utils'),
should = require('should'),
_ = require('lodash'),

4
core/test/utils/fixtures/app/good.js
View file

@ -1,6 +1,6 @@
var path = require('path'),
util = require('./goodlib.js'),
nested = require('./nested/goodnested');
util = require('./goodlib.js'),
nested = require('./nested/goodnested');
function GoodApp(app) {
this.app = app;