diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-09-05 20:20:26 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-09-05 20:20:26 -0700 |
| commit | 381f9931ec533dd9003f6e7224d7461b93f2fb24 (patch) | |
| tree | 28713a0bc0ac9bf25476494ed279e2e70e5d22e2 | |
| parent | b1bc95bfa55319288df6c0257adf6dcbeccb0a06 (diff) | |
| download | rails-381f9931ec533dd9003f6e7224d7461b93f2fb24.tar.gz rails-381f9931ec533dd9003f6e7224d7461b93f2fb24.tar.bz2 rails-381f9931ec533dd9003f6e7224d7461b93f2fb24.zip | |
Dependencies: bump to jquery-rails 4.0.0.beta2
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -9,7 +9,7 @@ gem 'mocha', '~> 0.14', require: false gem 'rack-cache', '~> 1.2' # TODO: Release this gem -gem 'jquery-rails', '~> 4.0.0.beta1' +gem 'jquery-rails', '~> 4.0.0.beta2' gem 'coffee-rails', '~> 4.0.0' # TODO: Release this gem gem 'rails-html-sanitizer', github: 'rails/rails-html-sanitizer' diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 143c39eff2..1cdad09391 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -283,7 +283,7 @@ module Rails gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry] if options[:javascript] == 'jquery' - gems << GemfileEntry.version('jquery-rails', '~> 4.0.0.beta1', + gems << GemfileEntry.version('jquery-rails', '~> 4.0.0.beta2', 'Use jQuery as the JavaScript library') else gems << GemfileEntry.version("#{options[:javascript]}-rails", nil, |