app_base.rb in railties-4.2.0.rc1

- old
+ new

@@ -235,17 +235,14 @@
       def assets_gemfile_entry
         return [] if options[:skip_sprockets]
 
         gems = []
         if options.dev? || options.edge?
-          gems << GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails',
-                                    'Use edge version of sprockets-rails')
           gems << GemfileEntry.github('sass-rails', 'rails/sass-rails',
                                     'Use SCSS for stylesheets')
         else
-          gems << GemfileEntry.version('sass-rails',
-                                     '~> 5.0.0.beta1',
+          gems << GemfileEntry.version('sass-rails', '~> 4.0',
                                      'Use SCSS for stylesheets')
         end
 
         gems << GemfileEntry.version('uglifier',
                                    '>= 1.3.0',
@@ -276,19 +273,13 @@
       def javascript_gemfile_entry
         if options[:skip_javascript]
           []
         else
           gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry]
+          gems << GemfileEntry.version("#{options[:javascript]}-rails", nil,
+                                       "Use #{options[:javascript]} as the JavaScript library")
 
-          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
-
           unless options[:skip_turbolinks]
             gems << GemfileEntry.version("turbolinks", nil,
              "Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks")
           end
 
@@ -340,10 +331,10 @@
       def bundle_install?
         !(options[:skip_gemfile] || options[:skip_bundle] || options[:pretend])
       end
 
       def spring_install?
-        !options[:skip_spring] && Process.respond_to?(:fork)
+        !options[:skip_spring] && Process.respond_to?(:fork) && !RUBY_PLATFORM.include?("cygwin")
       end
 
       def run_bundle
         bundle_command('install') if bundle_install?
       end