X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2a0917817c006aaad3be2fa6b5067eb6a506deb3..92f667f4885ce630ec9dc76eaf5bc42ebc49cee4:/Gemfile diff --git a/Gemfile b/Gemfile index a89169cfa..c6654cce2 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ gem 'validates_email_format_of', '>= 1.5.1' gem 'composite_primary_keys', '>= 5.0.0' gem 'http_accept_language', '>= 1.0.2' gem 'paperclip', '~> 2.0' -gem 'deadlock_retry', '>= 1.1.2' +gem 'deadlock_retry', '>= 1.2.0' # Character conversion support for ruby 1.8 gem 'iconv', :platforms => :ruby_18 @@ -28,9 +28,6 @@ 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 gem 'sanitize' @@ -41,8 +38,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