X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/05ed7cdfa5833ae834b1c9dd622430eb8a3ab10d..1cc57c620f28344452e8171a3f9f7b64d2036ad0:/Gemfile?ds=inline

diff --git a/Gemfile b/Gemfile
index 3705bc798..08dafa0cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,13 +2,13 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.1.1'
+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'
@@ -29,12 +29,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 +48,5 @@ group :assets do
   gem 'sass-rails', "  ~> 3.1.0"
   gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier'
+  gem 'therubyracer'
 end