aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock17
1 files changed, 10 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index bd2e2c30b9..892a9a40f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,6 +26,13 @@ GIT
specs:
sass (3.4.21)
+GIT
+ remote: git://github.com/turbolinks/turbolinks-rails.git
+ revision: 65884729016dbb4d032f12bb01b7e7c1ddeb68ac
+ specs:
+ turbolinks (5.0.0.beta2)
+ turbolinks-source
+
PATH
remote: .
specs:
@@ -64,8 +71,6 @@ PATH
activesupport (5.0.0.beta2)
concurrent-ruby (~> 1.0)
i18n (~> 0.7)
- json (~> 1.7, >= 1.7.7)
- method_source
minitest (~> 5.1)
tzinfo (~> 1.1)
rails (5.0.0.beta2)
@@ -113,7 +118,7 @@ GEM
coffee-script-source (1.10.0)
concurrent-ruby (1.0.0)
connection_pool (2.2.0)
- dalli (2.7.5)
+ dalli (2.7.6)
dante (0.2.0)
delayed_job (4.1.1)
activesupport (>= 3.0, < 5.0)
@@ -247,8 +252,7 @@ GEM
thor (0.19.1)
thread (0.1.7)
thread_safe (0.3.5)
- turbolinks (2.5.3)
- coffee-rails
+ turbolinks-source (5.0.0.beta2)
tzinfo (1.2.2)
thread_safe (~> 0.1)
tzinfo-data (1.2015.7)
@@ -287,7 +291,6 @@ DEPENDENCIES
faye-websocket
hiredis
jquery-rails
- json
kindlerb (= 0.1.1)
listen (~> 3.0.5)
minitest (< 5.3.4)
@@ -317,7 +320,7 @@ DEPENDENCIES
sqlite3 (~> 1.3.6)
stackprof
sucker_punch
- turbolinks
+ turbolinks!
tzinfo-data
uglifier (>= 1.3.0)
w3c_validators