Skip to content

Commit d6e46a5

Browse files
committed
Update to 6.0.2
Had to manually set the DOM ID on the react component call in order to fix a broken test.
1 parent 66a9da7 commit d6e46a5

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

Diff for: Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ gem "sdoc", group: :doc
4141
# Use Rails Html Sanitizer for HTML sanitization
4242
gem "rails-html-sanitizer"
4343

44-
gem "react_on_rails", "~> 6.0.0.rc.6"
44+
gem "react_on_rails", "~> 6.0.2"
4545

4646
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
4747
gem "therubyracer"

Diff for: Gemfile.lock

+8-8
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ GEM
9494
diff-lcs (1.2.5)
9595
docile (1.1.5)
9696
erubis (2.7.0)
97-
execjs (2.6.0)
97+
execjs (2.7.0)
9898
factory_girl (4.7.0)
9999
activesupport (>= 3.0.0)
100100
factory_girl_rails (4.7.0)
101101
factory_girl (~> 4.7.0)
102102
railties (>= 3.0.0)
103103
ffi (1.9.10)
104-
foreman (0.81.0)
104+
foreman (0.82.0)
105105
thor (~> 0.19.1)
106106
generator_spec (0.9.3)
107107
activesupport (>= 3.0.0)
@@ -127,11 +127,11 @@ GEM
127127
mail (2.6.4)
128128
mime-types (>= 1.16, < 4)
129129
method_source (0.8.2)
130-
mime-types (3.0)
130+
mime-types (3.1)
131131
mime-types-data (~> 3.2015)
132-
mime-types-data (3.2016.0221)
132+
mime-types-data (3.2016.0521)
133133
mini_portile2 (2.0.0)
134-
minitest (5.8.4)
134+
minitest (5.9.0)
135135
multi_json (1.12.0)
136136
nio4r (1.2.1)
137137
nokogiri (1.6.7.2)
@@ -206,7 +206,7 @@ GEM
206206
ffi (>= 0.5.0)
207207
rdoc (4.2.2)
208208
json (~> 1.4)
209-
react_on_rails (6.0.0.rc.6)
209+
react_on_rails (6.0.2)
210210
addressable
211211
connection_pool
212212
execjs (~> 2.5)
@@ -298,7 +298,7 @@ GEM
298298
debug_inspector
299299
railties (>= 4.2)
300300
websocket (1.2.3)
301-
websocket-driver (0.6.3)
301+
websocket-driver (0.6.4)
302302
websocket-extensions (>= 0.1.0)
303303
websocket-extensions (0.1.2)
304304
xpath (2.0.0)
@@ -339,7 +339,7 @@ DEPENDENCIES
339339
rails-html-sanitizer
340340
rails_12factor
341341
rainbow
342-
react_on_rails (~> 6.0.0.rc.6)
342+
react_on_rails (~> 6.0.2)
343343
rspec-rails (= 3.5.0.beta3)
344344
rspec-retry
345345
rubocop

Diff for: app/views/pages/index.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
<%= render "header" %>
1111

1212
<%= react_component('RouterApp', props: render(template: "/comments/index.json.jbuilder"),
13-
prerender: true, raise_on_prerender_error: true) %>
13+
prerender: true, raise_on_prerender_error: true, id: "RouterApp-react-component-0") %>

Diff for: client/npm-shrinkwrap.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"react-addons-pure-render-mixin": "^0.14.8",
7575
"react-bootstrap": "^0.28.5",
7676
"react-dom": "^0.14.8",
77-
"react-on-rails": "^6.0.0-rc.6",
77+
"react-on-rails": "^6.0.2",
7878
"react-redux": "^4.4.4",
7979
"react-router": "^2.2.1",
8080
"react-router-redux": "^4.0.2",

0 commit comments

Comments
 (0)