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

[rails.git] / app / abilities / api_ability.rb

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index 4ed9708b40340093f3a0baed7ecff96e2903a7de..3fe180eeb96fd323c63121e9ba34b5a027a32e87 100644 (file)
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@ -34,7 +34,7 @@ class ApiAbility
         can :read, UserPreference if scope?(token, :read_prefs)
         can [:update, :update_all, :destroy], UserPreference if scope?(token, :write_prefs)
 
         can :read, UserPreference if scope?(token, :read_prefs)
         can [:update, :update_all, :destroy], UserPreference if scope?(token, :write_prefs)
 

-        can [:inbox, :outbox, :read, :update, :destroy], Message if scope?(token, :consume_messages)
+        can [:read, :update, :destroy], Message if scope?(token, :consume_messages)

         can :create, Message if scope?(token, :send_messages)
 
         if user.terms_agreed?
         can :create, Message if scope?(token, :send_messages)
 
         if user.terms_agreed?