ActionController::UnknownAction is now AbstractController::ActionNotFound

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index a580bcea0101a651914efb116f6a50daf161df87..0e101dc39c1900d4bbc43c6f7520f1c286ad731a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -17,8 +17,10 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'oauth-plugin', '>= 0.4.0.pre7'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
-gem 'composite_primary_keys', '>= 4.1.2'
+gem 'composite_primary_keys', '>= 5.0.0.rc1'
 gem 'http_accept_language', '>= 1.0.2'
+gem 'paperclip', '~> 2.0'
+gem 'deadlock_retry', '>= 1.1.2'
 
 # Character conversion support for ruby 1.8
 gem 'iconv', :platforms => :ruby_18