Use normal fallbacks to handle the no/nb confusion

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index a6df39774ed5da6895f9e8c9fe422952445b6d27..1c8adfd34561af222239370fe9ad621d82c5f3fa 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,38 +1,52 @@
+# Gem source to use

 source 'http://rubygems.org'
 
 source 'http://rubygems.org'
 

-gem 'rails', '3.1.0'
+# Require rails
+gem 'rails', '3.1.3'

 
 

+# Require the postgres database driver

 gem 'pg'
 gem 'pg'

-gem 'arel', '>= 2.0.9'
+
+# Load jquery support
+gem 'jquery-rails'
+
+# Load rails plugins
+gem 'rails-i18n-updater'
+gem 'dynamic_form'
+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 'composite_primary_keys', '>= 4.1.1'
+
+# Load libxml support for XML parsing and generation

 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'

+
+# Load ImageMagick support for user picture resizing

 gem 'rmagick', :require => 'RMagick'
 gem 'rmagick', :require => 'RMagick'

-gem 'oauth', '>= 0.4.4'
-gem 'oauth-plugin', '>= 0.4.0.pre4'
-gem 'httpclient'
-gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
+
+# Load HTML sanitizer

 gem 'sanitize'
 gem 'sanitize'

-gem 'rails-i18n-updater'
-gem 'validates_email_format_of', '>= 1.5.1'
-gem 'open_id_authentication', '>= 1.1.0'
-gem 'prototype-rails'

 
 

-# Should only load if memcache is in use
-#gem 'memcached'
+# Load SystemTimer for implementing request timeouts
+gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
+
+# Load httpclient for SOAP support for Quova GeoIP queries
+gem 'httpclient'

 
 

-# Should only load if we're not in database offline mode
-gem 'composite_primary_keys', '= 4.0.0'
+# Load memcache in case we are using it
+gem 'memcache-client'
+gem 'memcached'

 
 

-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-group :development, :test do
+# Gems needed for running tests
+group :test do

   gem 'timecop'
 end
 
   gem 'timecop'
 end
 

-# Gems used only for assets and not required
-# in production environments by default.
+# Gems needed for compiling assets

 group :assets do
   gem 'sass-rails', "  ~> 3.1.0"
   gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier'
 group :assets do
   gem 'sass-rails', "  ~> 3.1.0"
   gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier'

+  gem 'therubyracer'

 end
 end