Merge branch 'staging' into master

2018-11-05 12:13:13 -05:00 · 2018-11-05 12:13:13 -05:00 · fceb41d806
parent 0152bc6525 0c96371780
commit fceb41d806
6 changed files with 7 additions and 6 deletions
--- a/api/controllers/TargetController.js
+++ b/api/controllers/TargetController.js
@ -2,6 +2,7 @@ module.exports = {
  show: function (req, res) {
    res.view('pages/temp', {
      email: req.user.email
+
    });
  }
 };
--- a/api/hooks/passport/index.js
+++ b/api/hooks/passport/index.js
@ -1,5 +1,6 @@
 let passportHook = sails.hooks.passport;

+
 if (!passportHook) {
  passportHook = function (sails) {
    return {
--- a/package.json
+++ b/package.json
@ -32,7 +32,6 @@
    "@babel/polyfill": "^7.0.0",
    "@babel/preset-env": "^7.1.0",
    "@babel/preset-react": "^7.0.0",
-    "@sailshq/eslint": "^4.19.3",
    "babel-loader": "^8.0.4",
    "babel-preset-es2015": "^6.24.1",
    "css-loader": "^1.0.1",