Skip to content

Commit 26bae33

Browse files
committed
update RoR to 6.0.0.rc.5
* update travis to ruby 2.3.1
1 parent 2fa2143 commit 26bae33

File tree

10 files changed

+924
-715
lines changed

10 files changed

+924
-715
lines changed

Diff for: .ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.0
1+
2.3.1

Diff for: .travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language:
22
- ruby
33
rvm:
4-
- 2.3.0
4+
- 2.3.1
55
sudo: false
66
addons:
77
apt:

Diff for: Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
source "https://rubygems.org"
2-
ruby "2.3.0"
2+
ruby "2.3.1"
33

44
#
55
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
6-
gem "rails", "5.0.0.beta3"
6+
gem "rails", "5.0.0.rc1"
77
gem "listen"
88

99
# Note: We're using sqllite3 for development and testing
@@ -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", "~> 5.1.1"
44+
gem "react_on_rails", "6.0.0.rc.5"
4545

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

Diff for: Gemfile.lock

+64-82
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.0.0.beta3)
5-
actionpack (= 5.0.0.beta3)
4+
actioncable (5.0.0.rc1)
5+
actionpack (= 5.0.0.rc1)
66
nio4r (~> 1.2)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.0.0.beta3)
9-
actionpack (= 5.0.0.beta3)
10-
actionview (= 5.0.0.beta3)
11-
activejob (= 5.0.0.beta3)
8+
actionmailer (5.0.0.rc1)
9+
actionpack (= 5.0.0.rc1)
10+
actionview (= 5.0.0.rc1)
11+
activejob (= 5.0.0.rc1)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 1.0, >= 1.0.5)
14-
actionpack (5.0.0.beta3)
15-
actionview (= 5.0.0.beta3)
16-
activesupport (= 5.0.0.beta3)
14+
actionpack (5.0.0.rc1)
15+
actionview (= 5.0.0.rc1)
16+
activesupport (= 5.0.0.rc1)
1717
rack (~> 2.x)
1818
rack-test (~> 0.6.3)
1919
rails-dom-testing (~> 1.0, >= 1.0.5)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.0.0.beta3)
22-
activesupport (= 5.0.0.beta3)
21+
actionview (5.0.0.rc1)
22+
activesupport (= 5.0.0.rc1)
2323
builder (~> 3.1)
2424
erubis (~> 2.7.0)
2525
rails-dom-testing (~> 1.0, >= 1.0.5)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.2)
27-
activejob (5.0.0.beta3)
28-
activesupport (= 5.0.0.beta3)
27+
activejob (5.0.0.rc1)
28+
activesupport (= 5.0.0.rc1)
2929
globalid (>= 0.3.6)
30-
activemodel (5.0.0.beta3)
31-
activesupport (= 5.0.0.beta3)
32-
activerecord (5.0.0.beta3)
33-
activemodel (= 5.0.0.beta3)
34-
activesupport (= 5.0.0.beta3)
30+
activemodel (5.0.0.rc1)
31+
activesupport (= 5.0.0.rc1)
32+
activerecord (5.0.0.rc1)
33+
activemodel (= 5.0.0.rc1)
34+
activesupport (= 5.0.0.rc1)
3535
arel (~> 7.0)
36-
activesupport (5.0.0.beta3)
37-
concurrent-ruby (~> 1.0)
36+
activesupport (5.0.0.rc1)
37+
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (~> 0.7)
3939
minitest (~> 5.1)
4040
tzinfo (~> 1.1)
@@ -48,22 +48,13 @@ GEM
4848
awesome_print (1.6.1)
4949
binding_of_caller (0.7.2)
5050
debug_inspector (>= 0.0.1)
51-
brakeman (3.2.1)
52-
erubis (~> 2.6)
53-
haml (>= 3.0, < 5.0)
54-
highline (>= 1.6.20, < 2.0)
55-
ruby2ruby (~> 2.3.0)
56-
ruby_parser (~> 3.8.1)
57-
safe_yaml (>= 1.0)
58-
sass (~> 3.0)
59-
slim (>= 1.3.6, < 4.0)
60-
terminal-table (~> 1.4)
51+
brakeman (3.3.0)
6152
builder (3.2.2)
6253
bundler-audit (0.5.0)
6354
bundler (~> 1.2)
6455
thor (~> 0.18)
65-
byebug (8.2.4)
66-
capybara (2.7.0)
56+
byebug (8.2.5)
57+
capybara (2.7.1)
6758
addressable
6859
mime-types (>= 1.16)
6960
nokogiri (>= 1.3.3)
@@ -73,7 +64,7 @@ GEM
7364
capybara-screenshot (1.0.12)
7465
capybara (>= 1.0, < 3)
7566
launchy
76-
capybara-webkit (1.10.1)
67+
capybara-webkit (1.11.1)
7768
capybara (>= 2.3.0, < 2.8.0)
7869
json
7970
childprocess (0.5.9)
@@ -90,15 +81,15 @@ GEM
9081
coffee-script-source
9182
execjs
9283
coffee-script-source (1.10.0)
93-
concurrent-ruby (1.0.1)
84+
concurrent-ruby (1.0.2)
9485
connection_pool (2.2.0)
9586
coveralls (0.8.13)
9687
json (~> 1.8)
9788
simplecov (~> 0.11.0)
9889
term-ansicolor (~> 1.3)
9990
thor (~> 0.19.1)
10091
tins (~> 1.6.0)
101-
database_cleaner (1.5.1)
92+
database_cleaner (1.5.3)
10293
debug_inspector (0.0.2)
10394
diff-lcs (1.2.5)
10495
docile (1.1.5)
@@ -110,16 +101,13 @@ GEM
110101
factory_girl (~> 4.7.0)
111102
railties (>= 3.0.0)
112103
ffi (1.9.10)
113-
foreman (0.78.0)
104+
foreman (0.81.0)
114105
thor (~> 0.19.1)
115106
generator_spec (0.9.3)
116107
activesupport (>= 3.0.0)
117108
railties (>= 3.0.0)
118109
globalid (0.3.6)
119110
activesupport (>= 4.1.0)
120-
haml (4.0.7)
121-
tilt
122-
highline (1.7.8)
123111
i18n (0.7.0)
124112
interception (0.5)
125113
io-like (0.3.0)
@@ -129,10 +117,11 @@ GEM
129117
json (1.8.3)
130118
launchy (2.4.3)
131119
addressable (~> 2.3)
132-
libv8 (3.16.14.13)
133-
listen (3.0.6)
134-
rb-fsevent (>= 0.9.3)
135-
rb-inotify (>= 0.9.7)
120+
libv8 (3.16.14.15)
121+
listen (3.1.3)
122+
rb-fsevent (~> 0.9, >= 0.9.7)
123+
rb-inotify (~> 0.9, >= 0.9.7)
124+
ruby_dep (~> 1.2)
136125
loofah (2.0.3)
137126
nokogiri (>= 1.5.9)
138127
mail (2.6.4)
@@ -143,11 +132,11 @@ GEM
143132
mime-types-data (3.2016.0221)
144133
mini_portile2 (2.0.0)
145134
minitest (5.8.4)
146-
multi_json (1.11.2)
135+
multi_json (1.12.0)
147136
nio4r (1.2.1)
148137
nokogiri (1.6.7.2)
149138
mini_portile2 (~> 2.0.0.rc2)
150-
parser (2.3.0.7)
139+
parser (2.3.1.0)
151140
ast (~> 2.2)
152141
pg (0.18.4)
153142
poltergeist (1.9.0)
@@ -175,21 +164,21 @@ GEM
175164
binding_of_caller (>= 0.7)
176165
pry (>= 0.9.11)
177166
puma (3.4.0)
178-
rack (2.0.0.alpha)
167+
rack (2.0.0.rc1)
179168
json
180169
rack-test (0.6.3)
181170
rack (>= 1.0)
182-
rails (5.0.0.beta3)
183-
actioncable (= 5.0.0.beta3)
184-
actionmailer (= 5.0.0.beta3)
185-
actionpack (= 5.0.0.beta3)
186-
actionview (= 5.0.0.beta3)
187-
activejob (= 5.0.0.beta3)
188-
activemodel (= 5.0.0.beta3)
189-
activerecord (= 5.0.0.beta3)
190-
activesupport (= 5.0.0.beta3)
171+
rails (5.0.0.rc1)
172+
actioncable (= 5.0.0.rc1)
173+
actionmailer (= 5.0.0.rc1)
174+
actionpack (= 5.0.0.rc1)
175+
actionview (= 5.0.0.rc1)
176+
activejob (= 5.0.0.rc1)
177+
activemodel (= 5.0.0.rc1)
178+
activerecord (= 5.0.0.rc1)
179+
activesupport (= 5.0.0.rc1)
191180
bundler (>= 1.3.0, < 2.0)
192-
railties (= 5.0.0.beta3)
181+
railties (= 5.0.0.rc1)
193182
sprockets-rails (>= 2.0.0)
194183
rails-deprecated_sanitizer (1.0.3)
195184
activesupport (>= 4.2.0.alpha)
@@ -204,20 +193,21 @@ GEM
204193
rails_stdout_logging
205194
rails_serve_static_assets (0.0.5)
206195
rails_stdout_logging (0.0.5)
207-
railties (5.0.0.beta3)
208-
actionpack (= 5.0.0.beta3)
209-
activesupport (= 5.0.0.beta3)
196+
railties (5.0.0.rc1)
197+
actionpack (= 5.0.0.rc1)
198+
activesupport (= 5.0.0.rc1)
210199
method_source
211200
rake (>= 0.8.7)
212201
thor (>= 0.18.1, < 2.0)
213202
rainbow (2.1.0)
214-
rake (10.5.0)
203+
rake (11.1.2)
215204
rb-fsevent (0.9.7)
216205
rb-inotify (0.9.7)
217206
ffi (>= 0.5.0)
218207
rdoc (4.2.2)
219208
json (~> 1.4)
220-
react_on_rails (5.1.1)
209+
react_on_rails (6.0.0.rc.5)
210+
addressable
221211
connection_pool
222212
execjs (~> 2.5)
223213
foreman
@@ -243,32 +233,27 @@ GEM
243233
rspec-retry (0.4.5)
244234
rspec-core
245235
rspec-support (3.5.0.beta3)
246-
rubocop (0.39.0)
247-
parser (>= 2.3.0.7, < 3.0)
236+
rubocop (0.40.0)
237+
parser (>= 2.3.1.0, < 3.0)
248238
powerpack (~> 0.1)
249239
rainbow (>= 1.99.1, < 3.0)
250240
ruby-progressbar (~> 1.7)
251241
unicode-display_width (~> 1.0, >= 1.0.1)
252242
ruby-lint (2.1.0)
253243
parser (~> 2.2)
254244
slop (~> 3.4, >= 3.4.7)
255-
ruby-progressbar (1.7.5)
256-
ruby2ruby (2.3.0)
257-
ruby_parser (~> 3.1)
258-
sexp_processor (~> 4.0)
259-
ruby_parser (3.8.1)
260-
sexp_processor (~> 4.1)
245+
ruby-progressbar (1.8.0)
246+
ruby_dep (1.3.1)
261247
rubyzip (1.2.0)
262-
safe_yaml (1.0.4)
263248
sass (3.4.22)
264249
sass-rails (5.0.4)
265250
railties (>= 4.0.0, < 5.0)
266251
sass (~> 3.1)
267252
sprockets (>= 2.8, < 4.0)
268253
sprockets-rails (>= 2.0, < 4.0)
269254
tilt (>= 1.1, < 3)
270-
scss_lint (0.47.1)
271-
rake (>= 0.9, < 11)
255+
scss_lint (0.48.0)
256+
rake (>= 0.9, < 12)
272257
sass (~> 3.4.15)
273258
sdoc (0.4.1)
274259
json (~> 1.7, >= 1.7.7)
@@ -277,15 +262,11 @@ GEM
277262
childprocess (~> 0.5)
278263
rubyzip (~> 1.0)
279264
websocket (~> 1.0)
280-
sexp_processor (4.7.0)
281265
simplecov (0.11.2)
282266
docile (~> 1.1.0)
283267
json (~> 1.8)
284268
simplecov-html (~> 0.10.0)
285269
simplecov-html (0.10.0)
286-
slim (3.0.6)
287-
temple (~> 0.7.3)
288-
tilt (>= 1.3.3, < 2.1)
289270
slop (3.6.0)
290271
spring (1.7.1)
291272
spring-commands-rspec (1.0.4)
@@ -298,10 +279,8 @@ GEM
298279
activesupport (>= 4.0)
299280
sprockets (>= 3.0.0)
300281
sqlite3 (1.3.11)
301-
temple (0.7.6)
302282
term-ansicolor (1.3.2)
303283
tins (~> 1.0)
304-
terminal-table (1.5.2)
305284
therubyracer (0.12.2)
306285
libv8 (~> 3.16.14.0)
307286
ref
@@ -313,7 +292,7 @@ GEM
313292
thread_safe (~> 0.1)
314293
uglifier (3.0.0)
315294
execjs (>= 0.3.0, < 3)
316-
unicode-display_width (1.0.3)
295+
unicode-display_width (1.0.5)
317296
web-console (3.1.1)
318297
activemodel (>= 4.2)
319298
debug_inspector
@@ -356,11 +335,11 @@ DEPENDENCIES
356335
pry-rescue
357336
pry-stack_explorer
358337
puma
359-
rails (= 5.0.0.beta3)
338+
rails (= 5.0.0.rc1)
360339
rails-html-sanitizer
361340
rails_12factor
362341
rainbow
363-
react_on_rails (~> 5.1.1)
342+
react_on_rails (= 6.0.0.rc.5)
364343
rspec-rails (= 3.5.0.beta3)
365344
rspec-retry
366345
rubocop
@@ -376,5 +355,8 @@ DEPENDENCIES
376355
uglifier
377356
web-console
378357

358+
RUBY VERSION
359+
ruby 2.3.1p112
360+
379361
BUNDLED WITH
380-
1.11.2
362+
1.12.3

0 commit comments

Comments
 (0)