diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-06-30 14:39:36 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-06-30 14:39:36 -0300 |
| commit | 19ba6b8d4e06cc8c2e596d576fcfbfce22fa5137 (patch) | |
| tree | 307480a155a710875b40d4e1fca211c22e03ff8e | |
| parent | e4c8aae643f36377a2eb6d42360eccc3f1f0d398 (diff) | |
| parent | 10ba7901243b5af5a1c8bab3a4c2ce08eecb65c9 (diff) | |
| download | rails-19ba6b8d4e06cc8c2e596d576fcfbfce22fa5137.tar.gz rails-19ba6b8d4e06cc8c2e596d576fcfbfce22fa5137.tar.bz2 rails-19ba6b8d4e06cc8c2e596d576fcfbfce22fa5137.zip | |
Merge pull request #25607 from sstephenson/turbolinks-5-final
Update to Turbolinks 5.0.0 final
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 13 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
3 files changed, 6 insertions, 11 deletions
@@ -12,7 +12,7 @@ gem 'mocha', '~> 0.14', require: false gem 'rack-cache', '~> 1.2' gem 'jquery-rails' gem 'coffee-rails' -gem 'turbolinks', github: 'turbolinks/turbolinks-rails' +gem 'turbolinks', '~> 5' # 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 cd519e107b..de4bc126ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,13 +28,6 @@ GIT specs: sass (3.4.22) -GIT - remote: git://github.com/turbolinks/turbolinks-rails.git - revision: 65884729016dbb4d032f12bb01b7e7c1ddeb68ac - specs: - turbolinks (5.0.0.beta2) - turbolinks-source - PATH remote: . specs: @@ -316,7 +309,9 @@ GEM thor (0.19.1) thread (0.1.7) thread_safe (0.3.5) - turbolinks-source (5.0.0.beta4) + turbolinks (5.0.0) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) tzinfo (1.2.2) thread_safe (~> 0.1) tzinfo-data (1.2016.4) @@ -387,7 +382,7 @@ DEPENDENCIES sqlite3 (~> 1.3.6) stackprof sucker_punch - turbolinks! + turbolinks (~> 5) tzinfo-data uglifier (>= 1.3.0) w3c_validators diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 647cf5b4e1..0835c09323 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -324,7 +324,7 @@ module Rails "Use #{options[:javascript]} as the JavaScript library") unless options[:skip_turbolinks] - gems << GemfileEntry.version("turbolinks", "~> 5.x", + gems << GemfileEntry.version("turbolinks", "~> 5", "Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks") end |