Use the released jquery-rails gem

rails · Sep 6, 2014 · b1bc95b · b1bc95b
1 parent dc8a759
commit b1bc95b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -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'

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
@@ -281,8 +281,14 @@ def javascript_gemfile_entry
           []
         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")