aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-09-19 20:57:29 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-09-19 20:57:29 -0700
commit71b88518f7c84466f90b3d39fba61281bb782748 (patch)
treec9441d1b0dcee884405417717a8a3e3f171b3dae /Gemfile
parentb4018fa74024ca4c80070f9922833431c567f0e7 (diff)
parent25d2b17a99a78955a90682fa41fda268c5532129 (diff)
downloadrails-71b88518f7c84466f90b3d39fba61281bb782748.tar.gz
rails-71b88518f7c84466f90b3d39fba61281bb782748.tar.bz2
rails-71b88518f7c84466f90b3d39fba61281bb782748.zip
Merge pull request #7702 from guilleiguaran/remove-manifest-option
Remove highly uncommon `config.assets.manifest` option
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 362e0790fc..d8092de9d9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,12 @@ end
# This needs to be with require false to avoid
# it being automatically loaded by sprockets
gem 'uglifier', require: false
-gem 'sprockets-rails', github: 'rails/sprockets-rails'
+
+if ENV['SPROCKETS_RAILS']
+ gem 'sprockets-rails', path: ENV['SPROCKETS_RAILS']
+else
+ gem 'sprockets-rails', github: 'rails/sprockets-rails'
+end
group :doc do
# The current sdoc cannot generate GitHub links due