summaryrefslogtreecommitdiffstats
path: root/app/models/watcher.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-02-21 11:04:50 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-02-21 11:04:50 +0000
commitfe28193e4eb9af2dc5262535a29ffde5249568fc (patch)
treebd4cf3a9fbada98e58e510ca0e25c42bf00676a7 /app/models/watcher.rb
parent9a986ac0a51fe844eee816325e6a6d4122136d9a (diff)
downloadredmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.tar.gz
redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.zip
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
Diffstat (limited to 'app/models/watcher.rb')
-rw-r--r--app/models/watcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/watcher.rb b/app/models/watcher.rb
index 38110c584..b13039f84 100644
--- a/app/models/watcher.rb
+++ b/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