X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3c4dec8ce99eec1a412bbe525a3dd4bc9021366f..101ee6ade2a24e8c468badb82d56c17b04e0df37:/Gemfile

diff --git a/Gemfile b/Gemfile
index 08dafa0cc..a75a9279a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,10 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'oauth-plugin', '>= 0.4.0.pre7'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
-gem 'composite_primary_keys', '>= 4.1.1'
+gem 'composite_primary_keys', '>= 4.1.2'
+
+# Character conversion support for ruby 1.8
+gem 'iconv', :platforms => :ruby_18
 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'