Sort node ids in test_ways_for_node

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 21b628832c6d5b66862a6b978fb5c4e027f716e5..08dafa0cc6e08029d2c358bccf77ed3ec7325384 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,13 +2,13 @@
 source 'http://rubygems.org'
 
 # Require rails
 source 'http://rubygems.org'
 
 # Require rails

-gem 'rails', '3.1.1'
+gem 'rails', '3.1.3'

 
 # Require the postgres database driver
 gem 'pg'
 
 
 # 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'
 
 # Load rails plugins
 gem 'rails-i18n-updater'


@@ -29,7 +29,7 @@ gem 'rmagick', :require => 'RMagick'
 gem 'sanitize'
 
 # Load SystemTimer for implementing request timeouts
 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 httpclient for SOAP support for Quova GeoIP queries
 gem 'httpclient'


@@ -48,4 +48,5 @@ group :assets do
   gem 'sass-rails', "  ~> 3.1.0"
   gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier'
   gem 'sass-rails', "  ~> 3.1.0"
   gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier'

+  gem 'therubyracer'

 end
 end