diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2012-10-04 20:22:18 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2012-10-04 20:22:42 +0200 |
| commit | e35d8b18d0649c0ecc58f6b73df6b3c8d0c6bb74 (patch) | |
| tree | a0b99a8fef34125500a448b7348bafee5119d8ee /railties/lib/rails | |
| parent | b0a7068564f0c95e7ef28fc39d0335ed17d93e90 (diff) | |
| download | rails-e35d8b18d0649c0ecc58f6b73df6b3c8d0c6bb74.tar.gz rails-e35d8b18d0649c0ecc58f6b73df6b3c8d0c6bb74.tar.bz2 rails-e35d8b18d0649c0ecc58f6b73df6b3c8d0c6bb74.zip | |
Turn turbolinks on by default for new apps
Diffstat (limited to 'railties/lib/rails')
3 files changed, 11 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 184c59cb90..7aa04f453f 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -226,7 +226,14 @@ module Rails end def javascript_gemfile_entry - "gem '#{options[:javascript]}-rails'" unless options[:skip_javascript] + unless options[:skip_javascript] + <<-GEMFILE + gem '#{options[:javascript]}-rails' + + # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks + gem 'turbolinks' + GEMFILE + end end def javascript_runtime_gemfile_entry diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 69027f2903..f58542653c 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -9,14 +9,13 @@ source 'https://rubygems.org' <%= assets_gemfile_entry %> <%= javascript_gemfile_entry %> -# Puts a simple HTTP cache in front of your app. -# For large-scale production use, consider using a caching reverse proxy like nginx, varnish, or squid. +# Puts a simple HTTP cache in front of your app (and gets you ready for later upgrading to nginx/varnish/squid) gem 'rack-cache', '~> 1.2' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' -# To use Jbuilder templates for JSON +# Build JSON APIs with ease. Read more: http://github.com/rails/jbuilder # gem 'jbuilder' # Use unicorn as the app server diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt index f33a7f4ac2..f61e481969 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt +++ b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt @@ -13,5 +13,6 @@ <% unless options[:skip_javascript] -%> //= require <%= options[:javascript] %> //= require <%= options[:javascript] %>_ujs +//= require turbolinks <% end -%> //= require_tree . |