Move json requirement to user Gemfile -- still need to do better than this, though

railties/lib/rails/generators/app_base.rb

@@ -134,7 +134,6 @@ def rails_gemfile_entry
             gem 'arel',      :git => 'git://github.com/rails/arel.git'
             gem 'rack',      :git => 'git://github.com/rack/rack.git'
             gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git"
-            gem 'json'       # CoffeeScript and Sprockets dependency
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
@@ -142,7 +141,6 @@ def rails_gemfile_entry
             gem 'arel',      :git => 'git://github.com/rails/arel.git'
             gem 'rack',      :git => 'git://github.com/rack/rack.git'
             gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git"
-            gem 'json'       # CoffeeScript and Sprockets dependency
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc
@@ -153,7 +151,6 @@ def rails_gemfile_entry
             # gem 'arel',      :git => 'git://github.com/rails/arel.git'
             # gem 'rack',      :git => 'git://github.com/rack/rack.git'
             # gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git"
-            # gem 'json'       # Sprockets dependency
           GEMFILE
         end
       end

railties/lib/rails/generators/rails/app/templates/Gemfile

@@ -5,8 +5,9 @@ source 'http://rubygems.org'
 <%= database_gemfile_entry -%>
 
 # Asset template engines
-gem 'coffee-script'
+gem 'json'  # Not needed on Ruby 1.9
 gem 'sass', :git => 'git://github.com/nex3/sass.git'
+gem 'coffee-script'
 
 # Use unicorn as the web server
 # gem 'unicorn'