Skip to content

Commit a3d1912

Browse files
committed
Turbolinks 5 and React on Rails v3.0.0-RC.2
1 parent 6fb842c commit a3d1912

File tree

4 files changed

+5368
-7
lines changed

4 files changed

+5368
-7
lines changed

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ gem "uglifier"
2323
gem "coffee-rails"
2424

2525
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
26-
gem "turbolinks"
26+
gem 'turbolinks', '>= 5.0.0.beta1'
2727

2828
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
2929
gem "jbuilder"
@@ -37,7 +37,7 @@ gem "sdoc", group: :doc
3737
# Use Rails Html Sanitizer for HTML sanitization
3838
gem "rails-html-sanitizer"
3939

40-
gem "react_on_rails", "~> 3.0.0-rc.1"
40+
gem "react_on_rails", "~> 3.0.0-rc.2"
4141

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

Gemfile.lock

+5-4
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,9 @@ GEM
297297
thread_safe (0.3.5)
298298
tilt (2.0.2)
299299
tins (1.6.0)
300-
turbolinks (2.5.3)
301-
coffee-rails
300+
turbolinks (5.0.0.beta1)
301+
turbolinks-source
302+
turbolinks-source (5.0.0.beta1.1)
302303
tzinfo (1.2.2)
303304
thread_safe (~> 0.1)
304305
uglifier (2.7.2)
@@ -346,7 +347,7 @@ DEPENDENCIES
346347
rails-html-sanitizer
347348
rails_12factor
348349
rainbow
349-
react_on_rails (~> 3.0.0.pre.rc.1)
350+
react_on_rails (~> 3.0.0.pre.rc.2)
350351
rspec-rails
351352
rspec-retry
352353
rubocop
@@ -359,7 +360,7 @@ DEPENDENCIES
359360
spring-commands-rspec
360361
sqlite3
361362
therubyracer
362-
turbolinks
363+
turbolinks (>= 5.0.0.beta1)
363364
uglifier
364365
web-console
365366

0 commit comments

Comments
 (0)