X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c2447e5ba1efb157296f968783b9575291b1e48b..92626671981f706fe3b162a36df293fbce305091:/Gemfile diff --git a/Gemfile b/Gemfile index bf1f2010d..e2d0b0c75 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,10 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.3' +gem 'rails', '3.2.5' + +# Require things which have moved to gems in ruby 1.9 +gem 'bigdecimal', :platforms => :ruby_19 # Require the postgres database driver gem 'pg' @@ -14,7 +17,7 @@ gem 'jquery-rails' gem 'rails-i18n', ">= 0.6.3" gem 'dynamic_form' gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' -gem 'oauth-plugin', '>= 0.4.0.1' +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.0' @@ -47,6 +50,7 @@ gem 'memcached', '>= 1.4.1' # Gems needed for running tests group :test do gem 'timecop' + gem 'minitest', :platforms => :ruby_19 end # Gems needed for compiling assets