X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9813d9f1e48d575bb0e0b5029dc0ec134a011090..7d92ec704786c2d887e1946f25746d6d70ee7ea8:/Gemfile

diff --git a/Gemfile b/Gemfile
index 76872dfff..7656092f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.3'
+gem 'rails', '3.2.9'
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', :platforms => :ruby_19
@@ -13,17 +13,25 @@ gem 'pg'
 # 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'
 gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
-gem 'openstreetmap-oauth-plugin', '>= 0.4.0.1', :require => 'oauth-plugin'
+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.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 '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'
@@ -59,4 +67,5 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
   gem 'therubyracer'
+  gem 'ejs'
 end