Update short link test results

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index b06702fb39e0d6f44ef90fedbca997fc332113eb..76071aa2e7d48f00585d20277fa7a20596de237b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,10 +2,13 @@
 source 'http://rubygems.org'
 
 # Require rails
 source 'http://rubygems.org'
 
 # Require rails

-gem 'rails', '3.2.11'
+gem 'rails', '3.2.12'

 
 # Require things which have moved to gems in ruby 1.9
 
 # 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'


@@ -38,7 +41,7 @@ gem 'ruby-openid', '>= 2.2.0'
 gem 'redcarpet'
 
 # Character conversion support for ruby 1.8
 gem 'redcarpet'
 
 # Character conversion support for ruby 1.8

-gem 'iconv', :platforms => :ruby_18
+gem 'iconv', '= 0.1', :platforms => :ruby_18

 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'


@@ -56,10 +59,15 @@ gem 'httpclient'
 # Load memcache in case we are using it
 gem 'memcached', '>= 1.4.1'
 
 # Load memcache in case we are using it
 gem 'memcached', '>= 1.4.1'
 

+# Gems useful for development
+group :development do
+  gem 'vendorer'
+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