X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7f598ab412674ce5a78da98c54aa2fe2e4a05792..8c79134a6ec4a370d691764dbba8d3270e3596ca:/Gemfile

diff --git a/Gemfile b/Gemfile
index f841dc19a..9bde0af13 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,9 @@ gem 'rails', '3.2.12'
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', :platforms => :ruby_19
 
+# Require things which have moved to gems in ruby 2.0
+gem 'psych', :platforms => :ruby_20
+
 # Require the postgres database driver
 gem 'pg'
 
@@ -56,10 +59,15 @@ gem 'httpclient'
 # Load memcache in case we are using it
 gem 'memcached', '>= 1.4.1'
 
+# Gems useful for development
+group :development do
+  gem 'vendorer'
+end
+
 # Gems needed for running tests
 group :test do
   gem 'timecop'
-  gem 'minitest', :platforms => :ruby_19
+  gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20]
 end
 
 # Gems needed for compiling assets