X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/652e94485f21ffbae1fc83acdd4f229c5957b7c1..c8fd34b178f90af59e2f0867fbdc03585f338e76:/Gemfile diff --git a/Gemfile b/Gemfile index 5ddb27e47..7109b1236 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.5' +gem 'rails', '3.2.6' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', :platforms => :ruby_19 @@ -20,7 +20,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' gem 'openstreetmap-oauth-plugin', '>= 0.4.0.1', :require => 'oauth-plugin' gem 'open_id_authentication', '>= 1.1.0' gem 'validates_email_format_of', '>= 1.5.1' -gem 'composite_primary_keys', '= 5.0.4' +gem 'composite_primary_keys', '>= 5.0.8' gem 'http_accept_language', '>= 1.0.2' gem 'paperclip', '~> 2.0' gem 'deadlock_retry', '>= 1.2.0'