Skip to content

Commit be73c02

Browse files
authored
Update to 8.0.0.beta.3 (shakacode#394)
Locking to Rails 5.0.3 as well.
1 parent ec97449 commit be73c02

File tree

4 files changed

+51
-51
lines changed

4 files changed

+51
-51
lines changed

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ruby "2.4.1"
44
#
55
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
66
gem "listen"
7-
gem "rails"
7+
gem "rails", "5.0.3"
88

99
# Note: We're using sqllite3 for development and testing
1010
# gem "sqlite3", group: [:development, :test]
@@ -38,7 +38,7 @@ gem "sdoc", group: :doc
3838
# Use Rails Html Sanitizer for HTML sanitization
3939
gem "rails-html-sanitizer"
4040

41-
gem "react_on_rails", "7.0.0"
41+
gem "react_on_rails", "8.0.0.beta.3"
4242

4343
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
4444
# mini_racer is probably faster than therubyracer

Gemfile.lock

+45-45
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.0.2)
5-
actionpack (= 5.0.2)
4+
actioncable (5.0.3)
5+
actionpack (= 5.0.3)
66
nio4r (>= 1.2, < 3.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.0.2)
9-
actionpack (= 5.0.2)
10-
actionview (= 5.0.2)
11-
activejob (= 5.0.2)
8+
actionmailer (5.0.3)
9+
actionpack (= 5.0.3)
10+
actionview (= 5.0.3)
11+
activejob (= 5.0.3)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.0.2)
15-
actionview (= 5.0.2)
16-
activesupport (= 5.0.2)
14+
actionpack (5.0.3)
15+
actionview (= 5.0.3)
16+
activesupport (= 5.0.3)
1717
rack (~> 2.0)
1818
rack-test (~> 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.0.2)
22-
activesupport (= 5.0.2)
21+
actionview (5.0.3)
22+
activesupport (= 5.0.3)
2323
builder (~> 3.1)
2424
erubis (~> 2.7.0)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.0.2)
28-
activesupport (= 5.0.2)
27+
activejob (5.0.3)
28+
activesupport (= 5.0.3)
2929
globalid (>= 0.3.6)
30-
activemodel (5.0.2)
31-
activesupport (= 5.0.2)
32-
activerecord (5.0.2)
33-
activemodel (= 5.0.2)
34-
activesupport (= 5.0.2)
30+
activemodel (5.0.3)
31+
activesupport (= 5.0.3)
32+
activerecord (5.0.3)
33+
activemodel (= 5.0.3)
34+
activesupport (= 5.0.3)
3535
arel (~> 7.0)
36-
activesupport (5.0.2)
36+
activesupport (5.0.3)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (~> 0.7)
3939
minitest (~> 5.1)
@@ -108,8 +108,8 @@ GEM
108108
generator_spec (0.9.3)
109109
activesupport (>= 3.0.0)
110110
railties (>= 3.0.0)
111-
globalid (0.3.7)
112-
activesupport (>= 4.1.0)
111+
globalid (0.4.0)
112+
activesupport (>= 4.2.0)
113113
i18n (0.8.1)
114114
interception (0.5)
115115
io-like (0.3.0)
@@ -126,7 +126,7 @@ GEM
126126
ruby_dep (~> 1.2)
127127
loofah (2.0.3)
128128
nokogiri (>= 1.5.9)
129-
mail (2.6.4)
129+
mail (2.6.5)
130130
mime-types (>= 1.16, < 4)
131131
method_source (0.8.2)
132132
mime-types (3.1)
@@ -135,10 +135,10 @@ GEM
135135
mini_portile2 (2.1.0)
136136
mini_racer (0.1.9)
137137
libv8 (~> 5.3)
138-
minitest (5.10.1)
138+
minitest (5.10.2)
139139
multi_json (1.12.1)
140140
nio4r (2.0.0)
141-
nokogiri (1.7.1)
141+
nokogiri (1.7.2)
142142
mini_portile2 (~> 2.1.0)
143143
parser (2.4.0.0)
144144
ast (~> 2.2)
@@ -168,29 +168,29 @@ GEM
168168
pry (>= 0.9.11)
169169
public_suffix (2.0.5)
170170
puma (3.8.2)
171-
rack (2.0.1)
171+
rack (2.0.3)
172172
rack-test (0.6.3)
173173
rack (>= 1.0)
174-
rails (5.0.2)
175-
actioncable (= 5.0.2)
176-
actionmailer (= 5.0.2)
177-
actionpack (= 5.0.2)
178-
actionview (= 5.0.2)
179-
activejob (= 5.0.2)
180-
activemodel (= 5.0.2)
181-
activerecord (= 5.0.2)
182-
activesupport (= 5.0.2)
174+
rails (5.0.3)
175+
actioncable (= 5.0.3)
176+
actionmailer (= 5.0.3)
177+
actionpack (= 5.0.3)
178+
actionview (= 5.0.3)
179+
activejob (= 5.0.3)
180+
activemodel (= 5.0.3)
181+
activerecord (= 5.0.3)
182+
activesupport (= 5.0.3)
183183
bundler (>= 1.3.0, < 2.0)
184-
railties (= 5.0.2)
184+
railties (= 5.0.3)
185185
sprockets-rails (>= 2.0.0)
186-
rails-dom-testing (2.0.2)
187-
activesupport (>= 4.2.0, < 6.0)
188-
nokogiri (~> 1.6)
186+
rails-dom-testing (2.0.3)
187+
activesupport (>= 4.2.0)
188+
nokogiri (>= 1.6)
189189
rails-html-sanitizer (1.0.3)
190190
loofah (~> 2.0)
191-
railties (5.0.2)
192-
actionpack (= 5.0.2)
193-
activesupport (= 5.0.2)
191+
railties (5.0.3)
192+
actionpack (= 5.0.3)
193+
activesupport (= 5.0.3)
194194
method_source
195195
rake (>= 0.8.7)
196196
thor (>= 0.18.1, < 2.0)
@@ -200,7 +200,7 @@ GEM
200200
rb-inotify (0.9.8)
201201
ffi (>= 0.5.0)
202202
rdoc (4.3.0)
203-
react_on_rails (7.0.0)
203+
react_on_rails (8.0.0.beta.3)
204204
addressable
205205
connection_pool
206206
execjs (~> 2.5)
@@ -327,10 +327,10 @@ DEPENDENCIES
327327
pry-rescue
328328
pry-stack_explorer
329329
puma
330-
rails
330+
rails (= 5.0.3)
331331
rails-html-sanitizer
332332
rainbow
333-
react_on_rails (= 7.0.0)
333+
react_on_rails (= 8.0.0.beta.3)
334334
redis
335335
rspec-rails (~> 3)
336336
rspec-retry
@@ -349,4 +349,4 @@ RUBY VERSION
349349
ruby 2.4.1p111
350350

351351
BUNDLED WITH
352-
1.14.6
352+
1.15.0

client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"react-bootstrap": "^0.30.8",
8080
"react-dom": "^15.4.1",
8181
"react-intl": "^2.2.2",
82-
"react-on-rails": "^7.0.0",
82+
"react-on-rails": "^8.0.0-beta.3",
8383
"react-redux": "^4.4.6",
8484
"react-router": "^3.0.0",
8585
"react-router-redux": "^4.0.7",

client/yarn.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -4653,9 +4653,9 @@ react-intl@^2.2.2:
46534653
intl-relativeformat "^1.3.0"
46544654
invariant "^2.1.1"
46554655

4656-
react-on-rails@^7.0.0:
4657-
version "7.0.0"
4658-
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-7.0.0.tgz#ff7f12fb918b14ef932f77a71532b0f9eceb7955"
4656+
react-on-rails@^8.0.0-beta.3:
4657+
version "8.0.0-beta.3"
4658+
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-8.0.0-beta.3.tgz#6f173283654c186b28883e4f4bcf8ed7b34e12b8"
46594659

46604660
react-overlays@^0.6.12:
46614661
version "0.6.12"

0 commit comments

Comments
 (0)