X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/78f608b114c05f1147936a57b930831e28000c1a..2fed3f0d6b1b2d5809ae87d1814af5e31e5e75d4:/Gemfile

diff --git a/Gemfile b/Gemfile
index 5b5a76e65..76071aa2e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,10 +2,13 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.9'
+gem 'rails', '3.2.12'
 
 # Require things which have moved to gems in ruby 1.9
-gem 'bigdecimal', :platforms => :ruby_19
+gem 'bigdecimal', "~> 1.1.0", :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'
@@ -38,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'
@@ -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
@@ -67,6 +75,6 @@ group :assets do
   gem 'sass-rails', '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
-  gem 'therubyracer'
+  gem 'therubyracer', '~> 0.10.2'
   gem 'ejs'
 end