mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-03 23:00:14 -05:00
Merge pull request #6925 from TryGhost/greenkeeper-grunt-jscs-3.0.0
Update grunt-jscs to version 3.0.0 🚀
This commit is contained in:
commit
451c29d06a
5 changed files with 24 additions and 19 deletions
|
@ -377,13 +377,15 @@ authentication = {
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatResponse(isSetup) {
|
function formatResponse(isSetup) {
|
||||||
return {setup: [{
|
return {setup: [
|
||||||
status: isSetup,
|
{
|
||||||
// Pre-populate from config if, and only if the values exist in config.
|
status: isSetup,
|
||||||
title: config.title || undefined,
|
// Pre-populate from config if, and only if the values exist in config.
|
||||||
name: config.user_name || undefined,
|
title: config.title || undefined,
|
||||||
email: config.user_email || undefined
|
name: config.user_name || undefined,
|
||||||
}]};
|
email: config.user_email || undefined
|
||||||
|
}
|
||||||
|
]};
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks = [
|
tasks = [
|
||||||
|
|
|
@ -34,14 +34,17 @@ function sendMail(object) {
|
||||||
|
|
||||||
return mailer.send(object.mail[0].message).catch(function (err) {
|
return mailer.send(object.mail[0].message).catch(function (err) {
|
||||||
if (mailer.state.usingDirect) {
|
if (mailer.state.usingDirect) {
|
||||||
notifications.add({notifications: [{
|
notifications.add(
|
||||||
type: 'warn',
|
{notifications: [{
|
||||||
message: [
|
type: 'warn',
|
||||||
i18n.t('warnings.index.unableToSendEmail'),
|
message: [
|
||||||
i18n.t('common.seeLinkForInstructions',
|
i18n.t('warnings.index.unableToSendEmail'),
|
||||||
{link: '<a href=\'http://support.ghost.org/mail\' target=\'_blank\'>http://support.ghost.org/mail</a>'})
|
i18n.t('common.seeLinkForInstructions',
|
||||||
].join(' ')
|
{link: '<a href=\'http://support.ghost.org/mail\' target=\'_blank\'>http://support.ghost.org/mail</a>'})
|
||||||
}]}, {context: {internal: true}});
|
].join(' ')
|
||||||
|
}]},
|
||||||
|
{context: {internal: true}}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Promise.reject(new errors.EmailError(err.message));
|
return Promise.reject(new errors.EmailError(err.message));
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/*globals describe, before, beforeEach, afterEach, it */
|
/*globals describe, before, beforeEach, afterEach, it */
|
||||||
var testUtils = require('../../utils'),
|
var testUtils = require('../../utils'),
|
||||||
should = require('should'),
|
should = require('should'),
|
||||||
_ = require('lodash'),
|
_ = require('lodash'),
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
var path = require('path'),
|
var path = require('path'),
|
||||||
util = require('./goodlib.js'),
|
util = require('./goodlib.js'),
|
||||||
nested = require('./nested/goodnested');
|
nested = require('./nested/goodnested');
|
||||||
|
|
||||||
function GoodApp(app) {
|
function GoodApp(app) {
|
||||||
this.app = app;
|
this.app = app;
|
||||||
|
|
|
@ -89,7 +89,7 @@
|
||||||
"grunt-contrib-watch": "1.0.0",
|
"grunt-contrib-watch": "1.0.0",
|
||||||
"grunt-docker": "0.0.11",
|
"grunt-docker": "0.0.11",
|
||||||
"grunt-express-server": "0.5.3",
|
"grunt-express-server": "0.5.3",
|
||||||
"grunt-jscs": "2.8.0",
|
"grunt-jscs": "3.0.0",
|
||||||
"grunt-mocha-cli": "2.1.0",
|
"grunt-mocha-cli": "2.1.0",
|
||||||
"grunt-mocha-istanbul": "5.0.1",
|
"grunt-mocha-istanbul": "5.0.1",
|
||||||
"grunt-shell": "1.3.0",
|
"grunt-shell": "1.3.0",
|
||||||
|
|
Loading…
Add table
Reference in a new issue