aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-06-30 14:39:36 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-06-30 14:39:36 -0300
commit19ba6b8d4e06cc8c2e596d576fcfbfce22fa5137 (patch)
tree307480a155a710875b40d4e1fca211c22e03ff8e /railties
parente4c8aae643f36377a2eb6d42360eccc3f1f0d398 (diff)
parent10ba7901243b5af5a1c8bab3a4c2ce08eecb65c9 (diff)
downloadrails-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
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
1 files changed, 1 insertions, 1 deletions
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