Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use sprockets-rails master

  • Loading branch information...
commit eafc2b0580ab7cbea12224746c9047f0cca11e2c 1 parent 6601917
@josh josh authored
Showing with 3 additions and 3 deletions.
  1. +1 −1  Gemfile
  2. +2 −2 railties/lib/rails/generators/app_base.rb
View
2  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
View
4 railties/lib/rails/generators/app_base.rb
@@ -195,7 +195,7 @@ def assets_gemfile_entry
# 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 @@ def assets_gemfile_entry
# 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'
Please sign in to comment.
Something went wrong with that request. Please try again.