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

diff --git a/Gemfile b/Gemfile
index 5d4f66989..787a08640 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 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
@@ -37,7 +37,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'