aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-02-04 14:24:08 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-02-04 14:24:36 -0200
commitdd67df6136951d7a449bf883bd8c4af10c75afb7 (patch)
tree1856ad97cd51dfe5433f9642dc0a778a70f51ddc
parentd3fd7b99c125758bb53f3dfe002ab6a34f33b20b (diff)
downloadrails-dd67df6136951d7a449bf883bd8c4af10c75afb7.tar.gz
rails-dd67df6136951d7a449bf883bd8c4af10c75afb7.tar.bz2
rails-dd67df6136951d7a449bf883bd8c4af10c75afb7.zip
Test with Turbolinks 5
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock7
2 files changed, 5 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index ba102fe711..8e2c69214a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'mocha', '~> 0.14', require: false
gem 'rack-cache', '~> 1.2'
gem 'jquery-rails'
gem 'coffee-rails', '~> 4.1.0'
-gem 'turbolinks'
+gem 'turbolinks', '~> 5.0.0.beta1'
# require: false so bcrypt is loaded only when has_secure_password is used.
# This is to avoid Active Model (and by extension the entire framework)
diff --git a/Gemfile.lock b/Gemfile.lock
index 169c65b39d..6b619e701f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -245,8 +245,9 @@ GEM
thor (0.19.1)
thread (0.1.7)
thread_safe (0.3.5)
- turbolinks (2.5.3)
- coffee-rails
+ turbolinks (5.0.0.beta1)
+ turbolinks-source
+ turbolinks-source (5.0.0.beta1.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
tzinfo-data (1.2015.7)
@@ -314,7 +315,7 @@ DEPENDENCIES
sqlite3 (~> 1.3.6)
stackprof
sucker_punch
- turbolinks
+ turbolinks (~> 5.0.0.beta1)
tzinfo-data
uglifier (>= 1.3.0)
w3c_validators