mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Dependencies: bump to jquery-rails 4.0.0.beta2

This commit is contained in:
Godfrey Chan 2014-09-05 20:20:26 -07:00
parent b1bc95bfa5
commit 381f9931ec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -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'

2
railties/lib/rails/generators/app_base.rb
View File

@ -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,