aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/app_base.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
-rw-r--r--railties/lib/rails/generators/app_base.rb3
1 files changed, 0 insertions, 3 deletions
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