X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b52e5ef1cf8caa53d710c298952fd626adc1b51e..c29bcca57b9a05a3ca1e55d5b3a089c7ef0b1a03:/Gemfile?ds=sidebyside

diff --git a/Gemfile b/Gemfile
index 511bf35e8..0f867f3d5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,8 +7,8 @@ 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'
@@ -18,6 +18,7 @@ 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 'jsonify-rails'
 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
@@ -29,7 +30,7 @@ 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'