Skip to content

Commit 2baa544

Browse files
committed
Update to latest versions of React on Rails
* And other ruby and npm dependencies
1 parent 62063d1 commit 2baa544

File tree

4 files changed

+829
-228
lines changed

4 files changed

+829
-228
lines changed

Gemfile

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

43-
gem "react_on_rails", "~> 5.0.0.rc.1"
43+
gem "react_on_rails", "~> 5.1.1"
4444

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

Gemfile.lock

+53-53
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.5.2)
5-
actionpack (= 4.2.5.2)
6-
actionview (= 4.2.5.2)
7-
activejob (= 4.2.5.2)
4+
actionmailer (4.2.6)
5+
actionpack (= 4.2.6)
6+
actionview (= 4.2.6)
7+
activejob (= 4.2.6)
88
mail (~> 2.5, >= 2.5.4)
99
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.5.2)
11-
actionview (= 4.2.5.2)
12-
activesupport (= 4.2.5.2)
10+
actionpack (4.2.6)
11+
actionview (= 4.2.6)
12+
activesupport (= 4.2.6)
1313
rack (~> 1.6)
1414
rack-test (~> 0.6.2)
1515
rails-dom-testing (~> 1.0, >= 1.0.5)
1616
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
actionview (4.2.5.2)
18-
activesupport (= 4.2.5.2)
17+
actionview (4.2.6)
18+
activesupport (= 4.2.6)
1919
builder (~> 3.1)
2020
erubis (~> 2.7.0)
2121
rails-dom-testing (~> 1.0, >= 1.0.5)
2222
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23-
activejob (4.2.5.2)
24-
activesupport (= 4.2.5.2)
23+
activejob (4.2.6)
24+
activesupport (= 4.2.6)
2525
globalid (>= 0.3.0)
26-
activemodel (4.2.5.2)
27-
activesupport (= 4.2.5.2)
26+
activemodel (4.2.6)
27+
activesupport (= 4.2.6)
2828
builder (~> 3.1)
29-
activerecord (4.2.5.2)
30-
activemodel (= 4.2.5.2)
31-
activesupport (= 4.2.5.2)
29+
activerecord (4.2.6)
30+
activemodel (= 4.2.6)
31+
activesupport (= 4.2.6)
3232
arel (~> 6.0)
33-
activesupport (4.2.5.2)
33+
activesupport (4.2.6)
3434
i18n (~> 0.7)
3535
json (~> 1.7, >= 1.7.7)
3636
minitest (~> 5.1)
@@ -41,7 +41,7 @@ GEM
4141
io-like (~> 0.3.0)
4242
arel (6.0.3)
4343
ast (2.2.0)
44-
autoprefixer-rails (6.3.3.1)
44+
autoprefixer-rails (6.3.6)
4545
execjs
4646
awesome_print (1.6.1)
4747
binding_of_caller (0.7.2)
@@ -68,10 +68,10 @@ GEM
6868
rack (>= 1.0.0)
6969
rack-test (>= 0.5.4)
7070
xpath (~> 2.0)
71-
capybara-screenshot (1.0.11)
71+
capybara-screenshot (1.0.12)
7272
capybara (>= 1.0, < 3)
7373
launchy
74-
capybara-webkit (1.8.0)
74+
capybara-webkit (1.9.0)
7575
capybara (>= 2.3.0, < 2.7.0)
7676
json
7777
childprocess (0.5.9)
@@ -130,16 +130,18 @@ GEM
130130
libv8 (3.16.14.13)
131131
loofah (2.0.3)
132132
nokogiri (>= 1.5.9)
133-
mail (2.6.3)
134-
mime-types (>= 1.16, < 3)
133+
mail (2.6.4)
134+
mime-types (>= 1.16, < 4)
135135
method_source (0.8.2)
136-
mime-types (2.99.1)
136+
mime-types (3.0)
137+
mime-types-data (~> 3.2015)
138+
mime-types-data (3.2016.0221)
137139
mini_portile2 (2.0.0)
138140
minitest (5.8.4)
139141
multi_json (1.11.2)
140142
nokogiri (1.6.7.2)
141143
mini_portile2 (~> 2.0.0.rc2)
142-
parser (2.3.0.6)
144+
parser (2.3.0.7)
143145
ast (~> 2.2)
144146
pg (0.18.4)
145147
poltergeist (1.9.0)
@@ -166,20 +168,20 @@ GEM
166168
pry-stack_explorer (0.4.9.2)
167169
binding_of_caller (>= 0.7)
168170
pry (>= 0.9.11)
169-
puma (3.1.0)
171+
puma (3.3.0)
170172
rack (1.6.4)
171173
rack-test (0.6.3)
172174
rack (>= 1.0)
173-
rails (4.2.5.2)
174-
actionmailer (= 4.2.5.2)
175-
actionpack (= 4.2.5.2)
176-
actionview (= 4.2.5.2)
177-
activejob (= 4.2.5.2)
178-
activemodel (= 4.2.5.2)
179-
activerecord (= 4.2.5.2)
180-
activesupport (= 4.2.5.2)
175+
rails (4.2.6)
176+
actionmailer (= 4.2.6)
177+
actionpack (= 4.2.6)
178+
actionview (= 4.2.6)
179+
activejob (= 4.2.6)
180+
activemodel (= 4.2.6)
181+
activerecord (= 4.2.6)
182+
activesupport (= 4.2.6)
181183
bundler (>= 1.3.0, < 2.0)
182-
railties (= 4.2.5.2)
184+
railties (= 4.2.6)
183185
sprockets-rails
184186
rails-deprecated_sanitizer (1.0.3)
185187
activesupport (>= 4.2.0.alpha)
@@ -193,24 +195,24 @@ GEM
193195
rails_serve_static_assets
194196
rails_stdout_logging
195197
rails_serve_static_assets (0.0.5)
196-
rails_stdout_logging (0.0.4)
197-
railties (4.2.5.2)
198-
actionpack (= 4.2.5.2)
199-
activesupport (= 4.2.5.2)
198+
rails_stdout_logging (0.0.5)
199+
railties (4.2.6)
200+
actionpack (= 4.2.6)
201+
activesupport (= 4.2.6)
200202
rake (>= 0.8.7)
201203
thor (>= 0.18.1, < 2.0)
202204
rainbow (2.1.0)
203205
rake (10.5.0)
204206
rdoc (4.2.2)
205207
json (~> 1.4)
206-
react_on_rails (5.0.0.rc.1)
208+
react_on_rails (5.1.1)
207209
connection_pool
208210
execjs (~> 2.5)
209211
foreman
210212
rails (>= 3.2)
211213
rainbow (~> 2.1)
212214
ref (2.0.0)
213-
rspec-core (3.4.3)
215+
rspec-core (3.4.4)
214216
rspec-support (~> 3.4.0)
215217
rspec-expectations (3.4.0)
216218
diff-lcs (>= 1.2.0, < 2.0)
@@ -229,12 +231,12 @@ GEM
229231
rspec-retry (0.4.5)
230232
rspec-core
231233
rspec-support (3.4.1)
232-
rubocop (0.37.2)
233-
parser (>= 2.3.0.4, < 3.0)
234+
rubocop (0.39.0)
235+
parser (>= 2.3.0.7, < 3.0)
234236
powerpack (~> 0.1)
235237
rainbow (>= 1.99.1, < 3.0)
236238
ruby-progressbar (~> 1.7)
237-
unicode-display_width (~> 0.3)
239+
unicode-display_width (~> 1.0, >= 1.0.1)
238240
ruby-lint (2.1.0)
239241
parser (~> 2.2)
240242
slop (~> 3.4, >= 3.4.7)
@@ -246,7 +248,7 @@ GEM
246248
sexp_processor (~> 4.1)
247249
rubyzip (1.2.0)
248250
safe_yaml (1.0.4)
249-
sass (3.4.21)
251+
sass (3.4.22)
250252
sass-rails (5.0.4)
251253
railties (>= 4.0.0, < 5.0)
252254
sass (~> 3.1)
@@ -259,9 +261,8 @@ GEM
259261
sdoc (0.4.1)
260262
json (~> 1.7, >= 1.7.7)
261263
rdoc (~> 4.0)
262-
selenium-webdriver (2.52.0)
264+
selenium-webdriver (2.53.0)
263265
childprocess (~> 0.5)
264-
multi_json (~> 1.0)
265266
rubyzip (~> 1.0)
266267
websocket (~> 1.0)
267268
sexp_processor (4.7.0)
@@ -277,7 +278,7 @@ GEM
277278
spring (1.6.4)
278279
spring-commands-rspec (1.0.4)
279280
spring (>= 0.9.1)
280-
sprockets (3.5.2)
281+
sprockets (3.6.0)
281282
concurrent-ruby (~> 1.0)
282283
rack (> 1, < 3)
283284
sprockets-rails (3.0.4)
@@ -298,15 +299,14 @@ GEM
298299
tins (1.6.0)
299300
tzinfo (1.2.2)
300301
thread_safe (~> 0.1)
301-
uglifier (2.7.2)
302-
execjs (>= 0.3.0)
303-
json (>= 1.8.0)
304-
unicode-display_width (0.3.1)
302+
uglifier (3.0.0)
303+
execjs (>= 0.3.0, < 3)
304+
unicode-display_width (1.0.3)
305305
web-console (3.1.1)
306306
activemodel (>= 4.2)
307307
debug_inspector
308308
railties (>= 4.2)
309-
websocket (1.2.2)
309+
websocket (1.2.3)
310310
websocket-driver (0.6.3)
311311
websocket-extensions (>= 0.1.0)
312312
websocket-extensions (0.1.2)
@@ -347,7 +347,7 @@ DEPENDENCIES
347347
rails-html-sanitizer
348348
rails_12factor
349349
rainbow
350-
react_on_rails (~> 5.0.0.rc.1)
350+
react_on_rails (~> 5.1.1)
351351
rspec-rails
352352
rspec-retry
353353
rubocop

0 commit comments

Comments
 (0)