X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/682ccc18df1911dbf737da87fc48d40705c72f40..574407e2baa079c503d1629d96d65b381da2966a:/Gemfile diff --git a/Gemfile b/Gemfile index e2e822ba4..98962574e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.0' +gem 'rails', '3.2.1' # Require the postgres database driver gem 'pg' @@ -17,10 +17,10 @@ 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.1.2' +gem 'deadlock_retry', '>= 1.2.0' # Character conversion support for ruby 1.8 gem 'iconv', :platforms => :ruby_18