X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/92626671981f706fe3b162a36df293fbce305091..d7da1562c3b3c7544e3899e7bc49f7b32c2d2d19:/Gemfile diff --git a/Gemfile b/Gemfile index e2d0b0c75..ad2f04c29 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.5' +gem 'rails', '3.2.8' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', :platforms => :ruby_19 @@ -17,13 +17,17 @@ gem 'jquery-rails' gem 'rails-i18n', ">= 0.6.3" gem 'dynamic_form' gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' -gem 'openstreetmap-oauth-plugin', '>= 0.4.0.1', :require => 'oauth-plugin' +gem 'oauth-plugin', '>= 0.4.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.0' +gem 'composite_primary_keys', '>= 5.0.8' gem 'http_accept_language', '>= 1.0.2' gem 'paperclip', '~> 2.0' gem 'deadlock_retry', '>= 1.2.0' +gem 'i18n-js', '>= 3.0.0.rc2' + +# We need ruby-openid 2.2.0 or later for ruby 1.9 support +gem 'ruby-openid', '>= 2.2.0' # Markdown formatting support gem 'redcarpet'