aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/app_base.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-03-13 16:08:13 -0700
committerJosé Valim <jose.valim@gmail.com>2012-03-13 16:08:13 -0700
commitc1f397f82c7b3f352500832a399b5dbdc500b9c8 (patch)
tree218de73b69ff4c7d4dd1847926436146d6546edd /railties/lib/rails/generators/app_base.rb
parentadafefb51d8ffda7d9f30a874d61ee4ce1b998bb (diff)
parente823c8bd6f34ef297393e0c543f55627f6165c87 (diff)
downloadrails-c1f397f82c7b3f352500832a399b5dbdc500b9c8.tar.gz
rails-c1f397f82c7b3f352500832a399b5dbdc500b9c8.tar.bz2
rails-c1f397f82c7b3f352500832a399b5dbdc500b9c8.zip
Merge pull request #5409 from rails/sprockets-rails
Remove sprockets integration from actionpack
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 7c449657b5..f775004f16 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -189,6 +189,7 @@ module Rails
# Gems used only for assets and not required
# in production environments by default.
group :assets do
+ gem 'sprockets-rails', :git => 'https://github.com/rails/sprockets-rails.git'
gem 'sass-rails', :git => 'https://github.com/rails/sass-rails.git'
gem 'coffee-rails', :git => 'https://github.com/rails/coffee-rails.git'
@@ -202,6 +203,7 @@ module Rails
# Gems used only for assets and not required
# in production environments by default.
group :assets do
+ gem 'sprockets-rails', :git => 'https://github.com/rails/sprockets-rails.git'
gem 'sass-rails', '~> 4.0.0.beta'
gem 'coffee-rails', '~> 4.0.0.beta'