diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-09-01 21:41:48 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-09-01 21:41:48 -0300 |
| commit | dd1fb2d7699da5262343e7ee50953e0c29df040f (patch) | |
| tree | 91667a45497718561e5a62df10583fc7dd65db96 | |
| parent | fcbdac7e82725c388bf5adf56a9a9a16d4efdbe0 (diff) | |
| download | rails-dd1fb2d7699da5262343e7ee50953e0c29df040f.tar.gz rails-dd1fb2d7699da5262343e7ee50953e0c29df040f.tar.bz2 rails-dd1fb2d7699da5262343e7ee50953e0c29df040f.zip | |
Use jquery-rails master
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -8,7 +8,7 @@ gemspec gem 'mocha', '~> 0.14', require: false gem 'rack-cache', '~> 1.2' -gem 'jquery-rails', '~> 3.1.0' +gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master' gem 'coffee-rails', '~> 4.0.0' gem 'rails-html-sanitizer' gem 'turbolinks', '~> 2.2.3' diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index b3a67266f7..841d39dad6 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -281,7 +281,7 @@ module Rails [] else gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry] - gems << GemfileEntry.version("#{options[:javascript]}-rails", nil, + gems << GemfileEntry.github("#{options[:javascript]}-rails", "rails/#{options[:javascript]}-rails", "Use #{options[:javascript]} as the JavaScript library") gems << GemfileEntry.version("turbolinks", nil, |