Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/watcher.rb

@@ -25,6 +25,6 @@ class Watcher < ActiveRecord::Base
   protected
   
   def validate
-    errors.add :user_id, :activerecord_error_invalid unless user.nil? || user.active?
+    errors.add :user_id, :invalid unless user.nil? || user.active?
   end
 end