Skip to content

Commit 1097b99

Browse files
committed
Update react-on-rails
1 parent 69980b3 commit 1097b99

File tree

3 files changed

+6307
-48
lines changed

3 files changed

+6307
-48
lines changed

Gemfile.lock

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,41 @@ GEM
44
acme-client (0.3.7)
55
faraday (~> 0.9, >= 0.9.1)
66
json-jwt (~> 1.2, >= 1.2.3)
7-
actioncable (5.0.2)
8-
actionpack (= 5.0.2)
7+
actioncable (5.0.3)
8+
actionpack (= 5.0.3)
99
nio4r (>= 1.2, < 3.0)
1010
websocket-driver (~> 0.6.1)
11-
actionmailer (5.0.2)
12-
actionpack (= 5.0.2)
13-
actionview (= 5.0.2)
14-
activejob (= 5.0.2)
11+
actionmailer (5.0.3)
12+
actionpack (= 5.0.3)
13+
actionview (= 5.0.3)
14+
activejob (= 5.0.3)
1515
mail (~> 2.5, >= 2.5.4)
1616
rails-dom-testing (~> 2.0)
17-
actionpack (5.0.2)
18-
actionview (= 5.0.2)
19-
activesupport (= 5.0.2)
17+
actionpack (5.0.3)
18+
actionview (= 5.0.3)
19+
activesupport (= 5.0.3)
2020
rack (~> 2.0)
2121
rack-test (~> 0.6.3)
2222
rails-dom-testing (~> 2.0)
2323
rails-html-sanitizer (~> 1.0, >= 1.0.2)
24-
actionview (5.0.2)
25-
activesupport (= 5.0.2)
24+
actionview (5.0.3)
25+
activesupport (= 5.0.3)
2626
builder (~> 3.1)
2727
erubis (~> 2.7.0)
2828
rails-dom-testing (~> 2.0)
2929
rails-html-sanitizer (~> 1.0, >= 1.0.3)
3030
active_model_serializers (0.9.4)
3131
activemodel (>= 3.2)
32-
activejob (5.0.2)
33-
activesupport (= 5.0.2)
32+
activejob (5.0.3)
33+
activesupport (= 5.0.3)
3434
globalid (>= 0.3.6)
35-
activemodel (5.0.2)
36-
activesupport (= 5.0.2)
37-
activerecord (5.0.2)
38-
activemodel (= 5.0.2)
39-
activesupport (= 5.0.2)
35+
activemodel (5.0.3)
36+
activesupport (= 5.0.3)
37+
activerecord (5.0.3)
38+
activemodel (= 5.0.3)
39+
activesupport (= 5.0.3)
4040
arel (~> 7.0)
41-
activesupport (5.0.2)
41+
activesupport (5.0.3)
4242
concurrent-ruby (~> 1.0, >= 1.0.2)
4343
i18n (~> 0.7)
4444
minitest (~> 5.1)
@@ -94,7 +94,7 @@ GEM
9494
execjs
9595
coffee-script-source (1.12.2)
9696
concurrent-ruby (1.0.5)
97-
connection_pool (2.2.0)
97+
connection_pool (2.2.1)
9898
dalli (2.7.6)
9999
debug_inspector (0.0.2)
100100
domain_name (0.5.20160310)
@@ -121,13 +121,11 @@ GEM
121121
i18n (~> 0.5)
122122
faraday (0.9.2)
123123
multipart-post (>= 1.2, < 3)
124-
foreman (0.82.0)
125-
thor (~> 0.19.1)
126124
friendly_id (5.1.0)
127125
activerecord (>= 4.0.0)
128126
get_process_mem (0.2.0)
129-
globalid (0.3.7)
130-
activesupport (>= 4.1.0)
127+
globalid (0.4.0)
128+
activesupport (>= 4.2.0)
131129
green_monkey (0.2.2)
132130
chronic_duration
133131
haml (>= 3.1.0)
@@ -180,7 +178,7 @@ GEM
180178
railties (>= 4, < 5.1)
181179
loofah (2.0.3)
182180
nokogiri (>= 1.5.9)
183-
mail (2.6.4)
181+
mail (2.6.5)
184182
mime-types (>= 1.16, < 4)
185183
meta-tags (2.1.0)
186184
actionpack (>= 3.0.0)
@@ -193,13 +191,13 @@ GEM
193191
mini_portile2 (2.1.0)
194192
mini_racer (0.1.4)
195193
libv8 (~> 5.0, < 5.1.11)
196-
minitest (5.10.1)
194+
minitest (5.10.2)
197195
multi_json (1.12.1)
198196
multipart-post (2.0.0)
199197
netrc (0.11.0)
200198
newrelic_rpm (3.16.2.321)
201199
nio4r (2.0.0)
202-
nokogiri (1.7.1)
200+
nokogiri (1.7.2)
203201
mini_portile2 (~> 2.1.0)
204202
numerizer (0.1.1)
205203
parser (2.3.1.4)
@@ -226,52 +224,52 @@ GEM
226224
multi_json (~> 1.0)
227225
pusher-signature (~> 0.1.8)
228226
pusher-signature (0.1.8)
229-
rack (2.0.1)
227+
rack (2.0.3)
230228
rack-cors (0.4.0)
231229
rack-mini-profiler (0.10.1)
232230
rack (>= 1.2.0)
233231
rack-ssl-enforcer (0.2.9)
234232
rack-test (0.6.3)
235233
rack (>= 1.0)
236-
rails (5.0.2)
237-
actioncable (= 5.0.2)
238-
actionmailer (= 5.0.2)
239-
actionpack (= 5.0.2)
240-
actionview (= 5.0.2)
241-
activejob (= 5.0.2)
242-
activemodel (= 5.0.2)
243-
activerecord (= 5.0.2)
244-
activesupport (= 5.0.2)
234+
rails (5.0.3)
235+
actioncable (= 5.0.3)
236+
actionmailer (= 5.0.3)
237+
actionpack (= 5.0.3)
238+
actionview (= 5.0.3)
239+
activejob (= 5.0.3)
240+
activemodel (= 5.0.3)
241+
activerecord (= 5.0.3)
242+
activesupport (= 5.0.3)
245243
bundler (>= 1.3.0, < 2.0)
246-
railties (= 5.0.2)
244+
railties (= 5.0.3)
247245
sprockets-rails (>= 2.0.0)
248246
rails-controller-testing (1.0.1)
249247
actionpack (~> 5.x)
250248
actionview (~> 5.x)
251249
activesupport (~> 5.x)
252-
rails-dom-testing (2.0.2)
253-
activesupport (>= 4.2.0, < 6.0)
254-
nokogiri (~> 1.6)
250+
rails-dom-testing (2.0.3)
251+
activesupport (>= 4.2.0)
252+
nokogiri (>= 1.6)
255253
rails-html-sanitizer (1.0.3)
256254
loofah (~> 2.0)
257255
rails_12factor (0.0.3)
258256
rails_serve_static_assets
259257
rails_stdout_logging
260258
rails_serve_static_assets (0.0.4)
261259
rails_stdout_logging (0.0.5)
262-
railties (5.0.2)
263-
actionpack (= 5.0.2)
264-
activesupport (= 5.0.2)
260+
railties (5.0.3)
261+
actionpack (= 5.0.3)
262+
activesupport (= 5.0.3)
265263
method_source
266264
rake (>= 0.8.7)
267265
thor (>= 0.18.1, < 2.0)
268-
rainbow (2.1.0)
266+
rainbow (2.2.2)
267+
rake
269268
rake (12.0.0)
270-
react_on_rails (6.1.1)
269+
react_on_rails (7.0.4)
271270
addressable
272271
connection_pool
273272
execjs (~> 2.5)
274-
foreman
275273
rails (>= 3.2)
276274
rainbow (~> 2.1)
277275
redcarpet (3.3.4)

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"react": "^15.3.1",
6969
"react-addons-pure-render-mixin": "^15.3.1",
7070
"react-dom": "^15.3.1",
71-
"react-on-rails": "^6.1.1",
71+
"react-on-rails": "7.0.4",
7272
"react-redux": "^4.4.5",
7373
"react-router": "^2.8.1",
7474
"react-router-redux": "^4.0.5",

0 commit comments

Comments
 (0)