Update to rails 3.2.6

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 0075f1771a8fc3f4db4d57ea20871c57a20899f7..3e83536b11199167e9e2b489ff6c38b37c7bfe9d 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,10 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.3'
+gem 'rails', '3.2.6'
+
+# Require things which have moved to gems in ruby 1.9
+gem 'bigdecimal', :platforms => :ruby_19
 
 # Require the postgres database driver
 gem 'pg'
@@ -17,11 +20,14 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 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'
+gem 'composite_primary_keys', '= 5.0.4'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
 
+# Browser detection support
+gem 'browser'
+
 # Markdown formatting support
 gem 'redcarpet'
 
@@ -47,6 +53,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