rails5 upgrade - update react_on_rails

sharetribe · Jun 20, 2017 · e2f3ccf · e2f3ccf
1 parent 398d47b
commit e2f3ccf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-6.9
+7.8
diff --git a/client/package.json b/client/package.json
@@ -2,7 +2,8 @@
   "repository": "sharetribe/sharetribe",
   "license": "MIT",
   "engines": {
-    "node": "6.9"
+    "node": "7.8",
+    "npm": "4.4.4"
   },
   "scripts": {
     "ensure-node-version": "check-node-version --package",
@@ -63,7 +64,7 @@
     "react-addons-shallow-compare": "15.4.1",
     "react-dates": "4.1.0",
     "react-dom": "15.4.1",
-    "react-on-rails": "6.1.1",
+    "react-on-rails": "6.9.3",
     "react-redux": "4.4.6",
     "redux": "3.6.0",
     "redux-thunk": "2.1.0",

diff --git a/config/initializers/react_on_rails.rb b/config/initializers/react_on_rails.rb
@@ -66,9 +66,6 @@ def self.custom_context(view_context)
   ################################################################################
   # MISCELLANEOUS OPTIONS
   ################################################################################
-  # Default is false, enable if your content security policy doesn't include `style-src: 'unsafe-inline'`
-  config.skip_display_none = false
-
   # This allows you to add additional values to the Rails Context. Implement one static method
   # called `custom_context(view_context)` and return a Hash.
   config.rendering_extension = RailsContextExtension

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "repository": "sharetribe/sharetribe",
   "license": "MIT",
   "engines": {
-    "node": "6.9"
+    "node": "7.8"
   },
   "scripts": {
     "postinstall": "cd client && npm install",