X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/732c20bf1b2709490c200696bed44d57346a2ffb..129d505d9117ad05abe6bbc4d1936fd9b6f7bc2a:/Gemfile

diff --git a/Gemfile b/Gemfile
index 0f867f3d5..4b2d2ba9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,10 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.1.3'
+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'
@@ -10,24 +13,39 @@ gem 'pg'
 # Load jquery support
 gem 'jquery-rails'
 
+# Load R2 for RTL conversion
+gem 'r2'
+
 # Load rails plugins
-gem 'rails-i18n-updater'
+gem 'rails-i18n', ">= 0.6.3"
 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 'composite_primary_keys', '>= 4.1.1'
+gem 'composite_primary_keys', '>= 5.0.9'
+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'
+
+# Markdown formatting support
+gem 'redcarpet'
+
+# Character conversion support for ruby 1.8
+gem 'iconv', :platforms => :ruby_18
+
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
 
-# Load ImageMagick support for user picture resizing
-gem 'rmagick', :require => 'RMagick'
-
-# Load HTML sanitizer
+# Use for HTML sanitisation
 gem 'sanitize'
+gem 'htmlentities'
 
 # Load SystemTimer for implementing request timeouts
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
@@ -36,18 +54,19 @@ gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_1
 gem 'httpclient'
 
 # Load memcache in case we are using it
-gem 'memcache-client'
-gem 'memcached'
+gem 'memcached', '>= 1.4.1'
 
 # Gems needed for running tests
 group :test do
   gem 'timecop'
+  gem 'minitest', :platforms => :ruby_19
 end
 
 # Gems needed for compiling assets
 group :assets do
-  gem 'sass-rails', "  ~> 3.1.0"
-  gem 'coffee-rails', "~> 3.1.0"
-  gem 'uglifier'
+  gem 'sass-rails', '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'uglifier', '>= 1.0.3'
   gem 'therubyracer'
+  gem 'ejs'
 end