X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/61dd2af0a0d952c9aabea92426e961cfc09b838b..c3cdd4b5d732ae6ea7a65490ed6797190f3f4330:/Gemfile diff --git a/Gemfile b/Gemfile index 5f63da33f..76071aa2e 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,10 @@ source 'http://rubygems.org' gem 'rails', '3.2.12' # Require things which have moved to gems in ruby 1.9 -gem 'bigdecimal', :platforms => :ruby_19 +gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19 + +# Require things which have moved to gems in ruby 2.0 +gem 'psych', :platforms => :ruby_20 # Require the postgres database driver gem 'pg' @@ -64,7 +67,7 @@ end # Gems needed for running tests group :test do gem 'timecop' - gem 'minitest', '~> 4.7.0', :platforms => :ruby_19 + gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20] end # Gems needed for compiling assets