kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Use jquery-rails 4.0.0

This commit is contained in:
Rafael Mendonça França 2014-11-25 22:34:10 -02:00
parent 807d61dc8b
commit 75eacb00e0
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -11,7 +11,7 @@ gem 'rake', '>= 10.3'
gem 'mocha', '~> 0.14', require: false
gem 'rack-cache', '~> 1.2'
gem 'jquery-rails', '~> 4.0.0.beta2'
gem 'jquery-rails', '~> 4.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'turbolinks'

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

@ -276,14 +276,8 @@ module Rails
[]
else
gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry]
if options[:javascript] == 'jquery'
gems << GemfileEntry.version('jquery-rails', '~> 4.0.0.beta2',
'Use jQuery as the JavaScript library')
else
gems << GemfileEntry.version("#{options[:javascript]}-rails", nil,
"Use #{options[:javascript]} as the JavaScript library")
end
gems << GemfileEntry.version("#{options[:javascript]}-rails", nil,
"Use #{options[:javascript]} as the JavaScript library")
unless options[:skip_turbolinks]
gems << GemfileEntry.version("turbolinks", nil,