Localisation updates from http://translatewiki.net.

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 25b10fe7b09c3895944fae03c49849846bc8bc0d..76071aa2e7d48f00585d20277fa7a20596de237b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,10 +2,13 @@
 source 'http://rubygems.org'
 
 # Require rails
 source 'http://rubygems.org'
 
 # Require rails

-gem 'rails', '3.2.8'
+gem 'rails', '3.2.12'

 
 # Require things which have moved to gems in ruby 1.9
 
 # Require things which have moved to gems in ruby 1.9

-gem 'bigdecimal', :platforms => :ruby_19
+gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19
+
+# Require things which have moved to gems in ruby 2.0
+gem 'psych', :platforms => :ruby_20

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


@@ -13,6 +16,9 @@ gem 'pg'
 # Load jquery support
 gem 'jquery-rails'
 
 # Load jquery support
 gem 'jquery-rails'
 

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

 # Load rails plugins
 gem 'rails-i18n', ">= 0.6.3"
 gem 'dynamic_form'
 # Load rails plugins
 gem 'rails-i18n', ">= 0.6.3"
 gem 'dynamic_form'


@@ -20,23 +26,22 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 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 'oauth-plugin', '>= 0.4.1', :require => 'oauth-plugin'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'

-gem 'composite_primary_keys', '>= 5.0.8'
+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'

 gem 'jsonify-rails'
 
 # We need ruby-openid 2.2.0 or later for ruby 1.9 support
 gem 'ruby-openid', '>= 2.2.0'
 
 gem 'jsonify-rails'
 
 # We need ruby-openid 2.2.0 or later for ruby 1.9 support
 gem 'ruby-openid', '>= 2.2.0'
 

-# Browser detection support
-gem 'browser'
-

 # Markdown formatting support
 gem 'redcarpet'
 
 # Character conversion support for ruby 1.8
 # Markdown formatting support
 gem 'redcarpet'
 
 # Character conversion support for ruby 1.8

-gem 'iconv', :platforms => :ruby_18
+gem 'iconv', '= 0.1', :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'


@@ -54,10 +59,15 @@ gem 'httpclient'
 # Load memcache in case we are using it
 gem 'memcached', '>= 1.4.1'
 
 # Load memcache in case we are using it
 gem 'memcached', '>= 1.4.1'
 

+# Gems useful for development
+group :development do
+  gem 'vendorer'
+end
+

 # 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
+  gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20]

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


@@ -65,5 +75,6 @@ group :assets do
   gem 'sass-rails', '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
   gem 'sass-rails', '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'

-  gem 'therubyracer'
+  gem 'therubyracer', '~> 0.10.2'
+  gem 'ejs'

 end
 end