aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/app_base.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2012-10-15 11:46:05 -0500
committerJoshua Peek <josh@joshpeek.com>2012-10-15 11:46:05 -0500
commiteafc2b0580ab7cbea12224746c9047f0cca11e2c (patch)
tree6baa855114267b7d9b7c563178f3a69d8db79de7 /railties/lib/rails/generators/app_base.rb
parent6601917ad96aa7e0fdaf96058cafe01fbf00bc12 (diff)
downloadrails-eafc2b0580ab7cbea12224746c9047f0cca11e2c.tar.gz
rails-eafc2b0580ab7cbea12224746c9047f0cca11e2c.tar.bz2
rails-eafc2b0580ab7cbea12224746c9047f0cca11e2c.zip
Use sprockets-rails master
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
-rw-r--r--railties/lib/rails/generators/app_base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 0b922d29a4..e761e26b04 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -195,7 +195,7 @@ module Rails
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'new-asset-url-api'
+ gem 'sprockets-rails', github: 'rails/sprockets-rails'
gem 'sass-rails', github: 'rails/sass-rails'
gem 'coffee-rails', github: 'rails/coffee-rails'
@@ -209,7 +209,7 @@ module Rails
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'new-asset-url-api'
+ gem 'sprockets-rails', github: 'rails/sprockets-rails'
gem 'sass-rails', '~> 4.0.0.beta'
gem 'coffee-rails', '~> 4.0.0.beta'