Detabify

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 40a8b66286f95c748805e327856aad8c02f75968..1c8adfd34561af222239370fe9ad621d82c5f3fa 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.0'
+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'


@@ -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 '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'
 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'


@@ -35,6 +35,7 @@ gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
 gem 'httpclient'
 
 # Load memcache in case we are using it
 gem 'httpclient'
 
 # Load memcache in case we are using it

+gem 'memcache-client'

 gem 'memcached'
 
 # Gems needed for running tests
 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 'sass-rails', "  ~> 3.1.0"
   gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier'

+  gem 'therubyracer'

 end
 end