X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/574407e2baa079c503d1629d96d65b381da2966a..6aca6cfabf21da48567e8197457dae8785b7324d:/Gemfile diff --git a/Gemfile b/Gemfile index 98962574e..65de156e1 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.1' +gem 'rails', '3.2.2' # Require the postgres database driver gem 'pg' @@ -11,7 +11,7 @@ gem 'pg' gem 'jquery-rails' # Load rails plugins -gem 'rails-i18n-updater' +gem 'rails-i18n', ">= 0.5.1" gem 'dynamic_form' gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' gem 'oauth-plugin', '>= 0.4.0.pre7' @@ -21,6 +21,7 @@ gem 'composite_primary_keys', '>= 5.0.0' gem 'http_accept_language', '>= 1.0.2' gem 'paperclip', '~> 2.0' gem 'deadlock_retry', '>= 1.2.0' +gem 'jsonify-rails' # Character conversion support for ruby 1.8 gem 'iconv', :platforms => :ruby_18 @@ -28,9 +29,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 +39,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