X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ee411e5154cedd644fe54ccb29d64b6d18cb9bde..e2b185133ee03480d5bf5d66ca74944527841e95:/Gemfile diff --git a/Gemfile b/Gemfile index 4556a6d06..0e101dc39 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +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.rc1' +gem 'http_accept_language', '>= 1.0.2' +gem 'paperclip', '~> 2.0' +gem 'deadlock_retry', '>= 1.1.2' # Character conversion support for ruby 1.8 gem 'iconv', :platforms => :ruby_18