Use sprockets-rails master

2 files changed, 3 insertions, 3 deletions

diff --git a/Gemfile b/Gemfile
index 94906a4b12..0fff8a8967 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_fi
 # it being automatically loaded by sprockets
 gem 'uglifier', require: false
 
-gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'new-asset-url-api'
+gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master'
 
 group :doc do
   # The current sdoc cannot generate GitHub links due
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'