Move the notes api methods into a controller in the api namespace

[rails.git] / app / models / user_block.rb

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 4f9cf11281896f6238e699160616510c91619b86..02af385a7a09389c88aa722ca8766054e3f2f29f 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -26,6 +26,7 @@
 
 class UserBlock < ActiveRecord::Base
   validate :moderator_permissions
+  validates :reason, :characters => true
 
   belongs_to :user, :class_name => "User", :foreign_key => :user_id
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
@@ -63,7 +64,7 @@ class UserBlock < ActiveRecord::Base
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.
   def revoke!(revoker)
-    update_attributes(
+    update(
       :ends_at => Time.now.getutc,
       :revoker_id => revoker.id,
       :needs_view => false