diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-02-05 11:47:37 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-02-05 11:47:37 -0200 |
| commit | fbab5c7e6a9df3533f8b0fa8d6609ac9ec3ba399 (patch) | |
| tree | 4799c8a9c6e38272982afcdcecb87a8633b674ef | |
| parent | 120c0f14b4905349b604ee9e9ad24abc83ac93e2 (diff) | |
| parent | 2669f3753d15b688be4340524606dd62f2455f37 (diff) | |
| download | rails-fbab5c7e6a9df3533f8b0fa8d6609ac9ec3ba399.tar.gz rails-fbab5c7e6a9df3533f8b0fa8d6609ac9ec3ba399.tar.bz2 rails-fbab5c7e6a9df3533f8b0fa8d6609ac9ec3ba399.zip | |
Merge pull request #23494 from prathamesh-sonpatki/update-turbolinks
Update turbolinks-rails for passing railties test
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 11 |
2 files changed, 9 insertions, 4 deletions
@@ -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', '~> 5.0.0.beta1' +gem 'turbolinks', github: 'turbolinks/turbolinks-rails' # 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 6b619e701f..0d2ce7b97f 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: 1604dcd7bad911f1471d65e4f47cd19d844354f1 + specs: + turbolinks (5.0.0.beta1) + turbolinks-source + PATH remote: . specs: @@ -245,8 +252,6 @@ GEM thor (0.19.1) thread (0.1.7) thread_safe (0.3.5) - turbolinks (5.0.0.beta1) - turbolinks-source turbolinks-source (5.0.0.beta1.1) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -315,7 +320,7 @@ DEPENDENCIES sqlite3 (~> 1.3.6) stackprof sucker_punch - turbolinks (~> 5.0.0.beta1) + turbolinks! tzinfo-data uglifier (>= 1.3.0) w3c_validators |