X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/10fb373e5e1fe6582e43f72556e5b15f86e6c20a..67182f824e9ace7d5f6d40691e2d3d120b8fbfea:/Gemfile

diff --git a/Gemfile b/Gemfile
index a580bcea0..8a4fdfe71 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.0'
+gem 'rails', '3.2.3'
 
 # Require the postgres database driver
 gem 'pg'
@@ -11,14 +11,19 @@ gem 'pg'
 gem 'jquery-rails'
 
 # Load rails plugins
-gem 'rails-i18n-updater'
+gem 'rails-i18n', ">= 0.6.2"
 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.2'
+gem 'composite_primary_keys', '>= 5.0.0'
 gem 'http_accept_language', '>= 1.0.2'
+gem 'paperclip', '~> 2.0'
+gem 'deadlock_retry', '>= 1.2.0'
+
+# Markdown formatting support
+gem 'redcarpet'
 
 # Character conversion support for ruby 1.8
 gem 'iconv', :platforms => :ruby_18
@@ -26,11 +31,9 @@ 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
@@ -39,8 +42,7 @@ 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