Merge remote-tracking branch 'upstream/master'

atomicjolt · Apr 18, 2017 · d9426ac · d9426ac
2 parents de30e1d + 3cecf11
commit d9426ac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "test": "cd ./client && ./node_modules/karma/bin/karma start",
     "coverage": "cat ./coverage/**/coverage.info | ./client/node_modules/coveralls/bin/coveralls.js",
     "hot_pack": "cd ./client && node webpack.hot.js --hotPack",
-    "hot": "cd ./client && node webpack.hot.js --hotPack --lint",
+    "hot": "cd ./client && node webpack.hot.js --hotPack",
     "live": "cd ./client && node server.js",
     "build_dev": "cd ./client && node ./build.js",
     "build_dev_pack": "cd ./client && node ./build.js --onlyPack",

diff --git a/template.rb b/template.rb
@@ -156,7 +156,6 @@ def app_dir
     RVM.gemset_use! url_safe_name
 
     run "gem install bundler"
-    run "gem install foreman"
     run "bundle install"
 
   rescue => ex