Merge pull request shakacode#290 from shakacode/test-update-deploy-task

Updated to React on Rails v6

Author: justin808

Gemfile

@@ -41,7 +41,7 @@ gem "sdoc", group: :doc
 # Use Rails Html Sanitizer for HTML sanitization
 gem "rails-html-sanitizer"
 
-gem "react_on_rails", "6.0.0.rc.5"
+gem "react_on_rails", "~> 6.0.0.rc.6"
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 gem "therubyracer"

Gemfile.lock

@@ -206,7 +206,7 @@ GEM
       ffi (>= 0.5.0)
     rdoc (4.2.2)
       json (~> 1.4)
-    react_on_rails (6.0.0.rc.5)
+    react_on_rails (6.0.0.rc.6)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -339,7 +339,7 @@ DEPENDENCIES
   rails-html-sanitizer
   rails_12factor
   rainbow
-  react_on_rails (= 6.0.0.rc.5)
+  react_on_rails (~> 6.0.0.rc.6)
   rspec-rails (= 3.5.0.beta3)
   rspec-retry
   rubocop

client/npm-shrinkwrap.json

@@ -74,7 +74,7 @@
     "react-addons-pure-render-mixin": "^0.14.8",
     "react-bootstrap": "^0.28.5",
     "react-dom": "^0.14.8",
-    "react-on-rails": "^6.0.0-rc.5",
+    "react-on-rails": "^6.0.0-rc.6",
     "react-redux": "^4.4.4",
     "react-router": "^2.2.1",
     "react-router-redux": "^4.0.2",