kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Use the released jquery-rails gem

Browse source
This commit is contained in:
Godfrey Chan 2014-09-05 17:55:45 -07:00
parent dc8a759552
commit b1bc95bfa5
2 changed files with 9 additions and 3 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', github: 'rails/jquery-rails', branch: 'master'
gem 'jquery-rails', '~> 4.0.0.beta1'
gem 'coffee-rails', '~> 4.0.0'
# TODO: Release this gem
gem 'rails-html-sanitizer', github: 'rails/rails-html-sanitizer'

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

@ -281,8 +281,14 @@ module Rails
[]
else
gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry]
gems << GemfileEntry.github("#{options[:javascript]}-rails", "rails/#{options[:javascript]}-rails",
"Use #{options[:javascript]} as the JavaScript library")
if options[:javascript] == 'jquery'
gems << GemfileEntry.version('jquery-rails', '~> 4.0.0.beta1',
'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("turbolinks", nil,
"Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks")