Merge pull request shakacode#166 from shakacode/fix-ci-build-failures

Fix ci build failures

Author: dylangrafmyre

.travis.yml

@@ -2,16 +2,24 @@ language:
   - ruby
 rvm:
   - 2.2.3
+sudo: false
+addons:
+  apt:
+    sources:
+      ubuntu-toolchain-r-test
+    packages:
+      g++-4.9
+env:
+  global:
+    - RAILS_ENV=test
+    - CXX=g++-4.9
 install:
   - bundle install
   - nvm install 5.0
   - nvm use 5.0
-  - npm install -g npm
   - npm install
   - cd client && npm run build:client
   - npm run build:server
-env:
-  - export RAILS_ENV=test
 before_script:
    - export DISPLAY=:99.0
    - sh -e /etc/init.d/xvfb start

client/app/stores/commentsStore.js

@@ -1,3 +1,6 @@
+// react/prop-types rule is ignored because of this issue: https://github.com/yannickcr/eslint-plugin-react/issues/9
+/* eslint react/prop-types: 0 */
+
 import { compose, createStore, applyMiddleware, combineReducers } from 'redux';
 import thunkMiddleware from 'redux-thunk';
 import loggerMiddleware from '../middlewares/loggerMiddleware';