Merge pull request #5663 from sebgie/mail-cleanup

Mail consolidation

.npmignore

@@ -29,6 +29,6 @@ CONTRIBUTING.md
 SECURITY.md
 .travis.yml
 *.html
-!core/server/email-templates/**
+!core/server/mail/templates/**
 bower_components/**
 .editorconfig

core/server/api/mail.js

@@ -9,7 +9,7 @@ var _            = require('lodash').runInContext(),
     Models       = require('../models'),
     path         = require('path'),
     fs           = require('fs'),
-    templatesDir = path.resolve(__dirname, '..', 'email-templates'),
+    templatesDir = path.resolve(__dirname, '..', 'mail', 'templates'),
     htmlToText   = require('html-to-text'),
     mail;
 
@@ -79,7 +79,7 @@ mail = {
      *
      * @param {Object} options {
      *              data: JSON object representing the data that will go into the email
-     *              template: which email template to load (files are stored in /core/server/email-templates/)
+     *              template: which email template to load (files are stored in /core/server/mail/templates/)
      *          }
      * @returns {*}
      */

core/server/mail/index.js

@@ -4,7 +4,7 @@ var _          = require('lodash'),
     Promise    = require('bluebird'),
     nodemailer = require('nodemailer'),
     validator  = require('validator'),
-    config     = require('./config');
+    config     = require('../config');
 
 function GhostMailer(opts) {
     opts = opts || {};