Merge branch 'leaflet'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 74f6009b671349105da6cbb870d9fe725748e75f..7656092f1407d4dff7c98aec9ee2a3d58a1a0f55 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,10 @@
 source 'http://rubygems.org'
 
 # Require rails
 source 'http://rubygems.org'
 
 # Require rails

-gem 'rails', '3.2.1'
+gem 'rails', '3.2.9'
+
+# Require things which have moved to gems in ruby 1.9
+gem 'bigdecimal', :platforms => :ruby_19

 
 # Require the postgres database driver
 gem 'pg'
 
 # Require the postgres database driver
 gem 'pg'


@@ -10,17 +13,28 @@ gem 'pg'
 # Load jquery support
 gem 'jquery-rails'
 
 # Load jquery support
 gem 'jquery-rails'
 

+# Load R2 for RTL conversion
+gem 'r2'
+

 # Load rails plugins
 # Load rails plugins

-gem 'rails-i18n', ">= 0.5.1"
+gem 'rails-i18n', ">= 0.6.3"

 gem 'dynamic_form'
 gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'dynamic_form'
 gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'

-gem 'oauth-plugin', '>= 0.4.0.pre7'
+gem 'oauth-plugin', '>= 0.4.1', :require => 'oauth-plugin'

 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'

-gem 'composite_primary_keys', '>= 5.0.0'
+gem 'composite_primary_keys', '>= 5.0.10'

 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'

+gem 'i18n-js', '>= 3.0.0.rc2'
+gem 'rack-cors'
+
+# We need ruby-openid 2.2.0 or later for ruby 1.9 support
+gem 'ruby-openid', '>= 2.2.0'
+
+# Markdown formatting support
+gem 'redcarpet'

 
 # Character conversion support for ruby 1.8
 gem 'iconv', :platforms => :ruby_18
 
 # Character conversion support for ruby 1.8
 gem 'iconv', :platforms => :ruby_18


@@ -28,8 +42,9 @@ gem 'iconv', :platforms => :ruby_18
 # 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'
 

-# Load HTML sanitizer
+# Use for HTML sanitisation

 gem 'sanitize'
 gem 'sanitize'

+gem 'htmlentities'

 
 # Load SystemTimer for implementing request timeouts
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
 
 # Load SystemTimer for implementing request timeouts
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18


@@ -43,6 +58,7 @@ gem 'memcached', '>= 1.4.1'
 # Gems needed for running tests
 group :test do
   gem 'timecop'
 # Gems needed for running tests
 group :test do
   gem 'timecop'

+  gem 'minitest', :platforms => :ruby_19

 end
 
 # Gems needed for compiling assets
 end
 
 # Gems needed for compiling assets


@@ -51,4 +67,5 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
   gem 'therubyracer'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
   gem 'therubyracer'

+  gem 'ejs'

 end
 end