diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-03-24 11:48:46 -0700 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-03-24 11:48:46 -0700 |
| commit | b78f77f8cf0b4257339df6e58c16b206c81318fb (patch) | |
| tree | 1e9e1c361ef05354cd07a757eb0bbec8c555d389 | |
| parent | d28247bf567e16e63bb770003f8b97b72d5668fa (diff) | |
| parent | 7a9a7007637b8279501770be03bd84ce83d61ab8 (diff) | |
| download | rails-b78f77f8cf0b4257339df6e58c16b206c81318fb.tar.gz rails-b78f77f8cf0b4257339df6e58c16b206c81318fb.tar.bz2 rails-b78f77f8cf0b4257339df6e58c16b206c81318fb.zip | |
Merge pull request #9904 from rubys/jquery-rails-github
Use jquery-rails from github
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 |
1 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 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' |