diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-21 17:51:33 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-21 17:51:33 -0800 |
| commit | dfb1dbb719b67b2565495bf5ca6e4542cbccd127 (patch) | |
| tree | 5639c905e606d01a85f6829b24ef7df1f2c9d05e /railties/lib/rails | |
| parent | 47229208fccb7fbb284935738beb74ad102d29ee (diff) | |
| parent | c09ef94a494eb8d0f690a84bc82b2bddcfe13e1b (diff) | |
| download | rails-dfb1dbb719b67b2565495bf5ca6e4542cbccd127.tar.gz rails-dfb1dbb719b67b2565495bf5ca6e4542cbccd127.tar.bz2 rails-dfb1dbb719b67b2565495bf5ca6e4542cbccd127.zip | |
Merge pull request #12993 from laurocaetano/skip_turbolinks
Option to skip turbolinks
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index d79cf2b2f0..2022b4ed3d 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -113,7 +113,7 @@ module Rails end def add_gem_entry_filter - @gem_filter = lambda { |next_filter,entry| + @gem_filter = lambda { |next_filter, entry| yield(entry) && next_filter.call(entry) }.curry[@gem_filter] end 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 8b91313e51..07ea09cdbd 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,6 +13,8 @@ <% unless options[:skip_javascript] -%> //= require <%= options[:javascript] %> //= require <%= options[:javascript] %>_ujs +<% if gemfile_entries.any? { |m| m.name == "turbolinks" } -%> //= require turbolinks <% end -%> +<% end -%> //= require_tree . |