Use jsonify to create JSON for notes so that it is properly formatted

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 788da1ebe379cea8319e108435868d5cfc18ec04..0f867f3d55a566210665c7a14731e89e4bdccfee 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,13 +2,13 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.1.2'
+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'