Copy updates

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 2237cf64bde06215ab9cf5e01c40df87226cc0d4..76071aa2e7d48f00585d20277fa7a20596de237b 100644 (file)
--- 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 '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'
 
 # Require the postgres database driver
 gem 'pg'


@@ -64,7 +67,7 @@ end
 # Gems needed for running tests
 group :test do
   gem 'timecop'
 # Gems needed for running tests
 group :test do
   gem 'timecop'

-  gem 'minitest', :platforms => :ruby_19
+  gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20]

 end
 
 # Gems needed for compiling assets
 end
 
 # Gems needed for compiling assets