X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c3436ec9c415c5ce843d36e1746a3d8b75f50820..73b8e6f0ad8a6c3c97a646b842e27864d557a9db:/Gemfile

diff --git a/Gemfile b/Gemfile
index 40a8b6628..a75a9279a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,13 +2,13 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.1.0'
+gem 'rails', '3.1.3'
 
 # Require the postgres database driver
 gem 'pg'
 
-# Load prototype support
-gem 'prototype-rails'
+# Load jquery support
+gem 'jquery-rails'
 
 # Load rails plugins
 gem 'rails-i18n-updater'
@@ -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.0.0'
+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'
@@ -29,12 +32,13 @@ gem 'rmagick', :require => 'RMagick'
 gem 'sanitize'
 
 # Load SystemTimer for implementing request timeouts
-gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
+gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
 
 # Load httpclient for SOAP support for Quova GeoIP queries
 gem 'httpclient'
 
 # Load memcache in case we are using it
+gem 'memcache-client'
 gem 'memcached'
 
 # Gems needed for running tests
@@ -47,4 +51,5 @@ group :assets do
   gem 'sass-rails', "  ~> 3.1.0"
   gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier'
+  gem 'therubyracer'
 end