Merge remote-tracking branch 'origin/knex' into knex

dev-tools/Procfile.dev

@@ -6,4 +6,4 @@ messagesender56: npm run dev-message-sender-56
 messagesender789: npm run dev-message-sender-789
 jobhandler: npm run dev-job-handler
 #incomingmessagehandler: npm run dev-incoming-message-handler
-#rethinkdb: rethinkdb
+rethinkdb: rethinkdb

package.json

@@ -111,7 +111,7 @@
     "react-router-redux": "^4.0.5",
     "react-tap-event-plugin": "^1.0.0",
     "redux-thunk": "^2.1.0",
-    "rethink-knex-adapter": "MoveOnOrg/rethink-knex-adapter",
+    "rethink-knex-adapter": "rethink-knex-adapter",
     "rollbar": "^0.6.2",
     "stripe": "^4.9.0",
     "thinky": "^2.3.3",
@@ -139,6 +139,7 @@
     "nodemon": "^1.9.2",
     "react-hot-loader": "^1.3.0",
     "regenerator-runtime": "^0.10.5",
+    "rethink-knex-adapter": "git+https://[email protected]/MoveOnOrg/rethink-knex-adapter.git",
     "sqlite3": "^3.1.8",
     "webpack-dev-server": "^1.14.1"
   },

src/server/api/schema.js

@@ -497,7 +497,6 @@ const rootMutations = {
         is_valid: false
       }, { conflict: 'update' })
 
-      console.log("new organization", newOrganization)
       return newOrganization
     },
     editCampaignContactMessageStatus: async(_, { messageStatus, campaignContactId }, { loaders }) => {

webpack/server.js

@@ -5,7 +5,7 @@ import { log } from '../src/lib'
 
 const webpackPort = process.env.WEBPACK_PORT || 3000
 const appPort = process.env.DEV_APP_PORT
-const webpackHost = process.env.WEBPACK_HOST || 'localhost'
+const webpackHost = process.env.WEBPACK_HOST || '127.0.0.1'
 
 Object.keys(config.entry)
 .forEach((key) => {