Merge branch 'master' of https://github.com/rails/rails into performance_test

1 files changed, 5 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index 879598c6db..a94f3689bc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,10 @@ end
 gem "rack", :git => "git://github.com/rack/rack.git"
 gem "rack-test", :git => "git://github.com/brynary/rack-test.git"
 
+gem "sprockets", :git => "git://github.com/sstephenson/sprockets.git"
+gem "coffee-script"
+gem "sass", ">= 3.0"
+
 gem "rake",  ">= 0.8.7"
 gem "mocha", ">= 0.9.8"
 
@@ -28,6 +32,7 @@ platforms :mri_18 do
   gem "system_timer"
   gem "ruby-debug", ">= 0.10.3"
   gem 'ruby-prof'
+  gem "json"
 end
 
 platforms :mri_19 do