Merge remote-tracking branch 'upstream/pull/1827'

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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 4f9cf11281896f6238e699160616510c91619b86..9f32862af52546bfbf4542599d38916af0ca76e8 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -63,7 +63,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)
   # 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
       :ends_at => Time.now.getutc,
       :revoker_id => revoker.id,
       :needs_view => false