aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorAndrew White <andrew.white@unboxedconsulting.com>2015-09-18 06:54:27 +0100
committerAndrew White <andrew.white@unboxedconsulting.com>2015-09-21 14:02:41 +0100
commit2b16816bc3193444397b1ec0100bd15f5a44f7d6 (patch)
tree7d25a2b0736a1ab9e22cc712ff538f3702c4db88 /Gemfile.lock
parentb3eac823006eb6a346f88793aabef28a6d4f928c (diff)
downloadrails-2b16816bc3193444397b1ec0100bd15f5a44f7d6.tar.gz
rails-2b16816bc3193444397b1ec0100bd15f5a44f7d6.tar.bz2
rails-2b16816bc3193444397b1ec0100bd15f5a44f7d6.zip
Use master version of Turbolinks gem
Since `alias_method_chain` is deprecated we need to use the master version of the Turbolinks gem as it has support for using `Module#prepend`.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock12
1 files changed, 9 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 16225777b6..6e62c395ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,6 +89,14 @@ GIT
sprockets (4.0.0)
rack (> 1, < 3)
+GIT
+ remote: git://github.com/rails/turbolinks.git
+ revision: 6d2ffc0e9eadb047ca5febbc08da8d92acab78c4
+ branch: master
+ specs:
+ turbolinks (3.0.0)
+ coffee-rails
+
PATH
remote: .
specs:
@@ -273,8 +281,6 @@ GEM
thread_safe (0.3.5)
timers (4.0.4)
hitimes
- turbolinks (2.5.3)
- coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
tzinfo-data (1.2015.6)
@@ -341,7 +347,7 @@ DEPENDENCIES
sqlite3 (~> 1.3.6)
stackprof
sucker_punch
- turbolinks
+ turbolinks!
tzinfo-data
uglifier (>= 1.3.0)
w3c_validators