From 7a9a7007637b8279501770be03bd84ce83d61ab8 Mon Sep 17 00:00:00 2001 From: Sam Ruby Date: Sun, 24 Mar 2013 14:38:06 -0400 Subject: Use jquery-rails from github completes https://github.com/rails/rails/commit/6f3f0f86332004fcee5c2f05d52bbff08c22f980 --- railties/lib/rails/generators/app_base.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'railties') diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index e312afa091..ef39a4b6a8 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -210,9 +210,11 @@ module Rails end def javascript_gemfile_entry + args = {'jquery' => ", github: 'rails/jquery-rails'"} + unless options[:skip_javascript] <<-GEMFILE.strip_heredoc - gem '#{options[:javascript]}-rails' + gem '#{options[:javascript]}-rails'#{args[options[:javascript]]} # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' -- cgit v1.2.3