From cf5599d9fa8deb7cc19c1f29ada29b39e75df039 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 13 Apr 2011 17:31:32 +0200 Subject: Move json requirement to user Gemfile -- still need to do better than this, though --- railties/lib/rails/generators/app_base.rb | 3 --- railties/lib/rails/generators/rails/app/templates/Gemfile | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 0e1c46bdf6..4f791a64e6 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -134,7 +134,6 @@ module Rails 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 @@ module Rails 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 @@ module Rails # 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 diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 0f5cdb09f2..6955da72c3 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/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' -- cgit v1.2.3