Merge branch 'rails41'

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

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index 2cf0eefc419fd3770c2c339819ac1beb56d1f169..cb1a97dcabfafa8ab5c938dfc408a24174fc8a84 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -32,11 +32,11 @@ 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_attributes(

       :ends_at => Time.now.getutc(),
       :revoker_id => revoker.id,
       :needs_view => false
       :ends_at => Time.now.getutc(),
       :revoker_id => revoker.id,
       :needs_view => false

-    }, :without_protection => true)
+    )

   end
 
 private
   end
 
 private