aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-19 07:36:50 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-19 07:36:50 -0700
commitbf4c8fe69447c489dcae5e828114651b2213e210 (patch)
tree617a05a17b89348d3d1c6df79246132e55ca42fc /Gemfile
parentf4ad0ebe7a6b17658bddfeb996e3c34835b75623 (diff)
parentbbcb6257ee3c7335bc76fbf5dcfe363d9d5590ce (diff)
downloadrails-bf4c8fe69447c489dcae5e828114651b2213e210.tar.gz
rails-bf4c8fe69447c489dcae5e828114651b2213e210.tar.bz2
rails-bf4c8fe69447c489dcae5e828114651b2213e210.zip
Merge pull request #7482 from route/syncing_tests_for_sprockets
Use last version of sprockets-rails and sync tests for assets.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index f0c06a19e2..362e0790fc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,8 @@ end
# This needs to be with require false to avoid
# it being automatically loaded by sprockets
-gem 'uglifier', '>= 1.0.3', require: false
+gem 'uglifier', require: false
+gem 'sprockets-rails', github: 'rails/sprockets-rails'
group :doc do
# The current sdoc cannot generate GitHub links due