X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6bd16d543a19576dbe783240867b87a5cf844946..28faa175262c597710c5140072b2f2a68c2758f9:/Gemfile

diff --git a/Gemfile b/Gemfile
index 5d4f66989..9bde0af13 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,11 +2,14 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.10'
+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'
 
@@ -29,6 +32,7 @@ gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'i18n-js', '>= 3.0.0.rc2'
 gem 'rack-cors'
+gem 'jsonify-rails'
 
 # We need ruby-openid 2.2.0 or later for ruby 1.9 support
 gem 'ruby-openid', '>= 2.2.0'
@@ -37,7 +41,7 @@ gem 'ruby-openid', '>= 2.2.0'
 gem 'redcarpet'
 
 # Character conversion support for ruby 1.8
-gem 'iconv', :platforms => :ruby_18
+gem 'iconv', '= 0.1', :platforms => :ruby_18
 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
@@ -55,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