X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cd128966946be4690c5ec5349200721f53cab769..ae9131bc8e8aadd76b2ed7939be142e649d25653:/Gemfile?ds=inline

diff --git a/Gemfile b/Gemfile
index 0a4f1638c..1c8adfd34 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,7 @@ 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.1'
 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
@@ -34,8 +34,9 @@ gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
 # Load httpclient for SOAP support for Quova GeoIP queries
 gem 'httpclient'
 
-# Should only load if memcache is in use
-#gem 'memcached'
+# Load memcache in case we are using it
+gem 'memcache-client'
+gem 'memcached'
 
 # Gems needed for running tests
 group :test do
@@ -47,4 +48,5 @@ group :assets do
   gem 'sass-rails', "  ~> 3.1.0"
   gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier'
+  gem 'therubyracer'
 end