TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-12 16:14:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6925 from TryGhost/greenkeeper-grunt-jscs-3.0.0

Browse Source 
Update grunt-jscs to version 3.0.0 🚀
This commit is contained in:
Austin Burdine 2016-06-11 13:52:16 -06:00 committed by GitHub
commit 451c29d06a
5 changed files with 24 additions and 19 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;

2
package.json
View File

@ -89,7 +89,7 @@
"grunt-contrib-watch": "1.0.0",
"grunt-docker": "0.0.11",
"grunt-express-server": "0.5.3",
"grunt-jscs": "2.8.0",
"grunt-jscs": "3.0.0",
"grunt-mocha-cli": "2.1.0",
"grunt-mocha-istanbul": "5.0.1",
"grunt-shell": "1.3.0",