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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index e31e3e930cc8ed60368b85c94fc73318756491a7..3ba2ab7071cf763a5fe37b50e277aa7914ab1a47 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -22,7 +22,7 @@ class Ability
       can [:create, :update], :password
       can :read, Redaction
       can [:create, :destroy], :session
       can [:create, :update], :password
       can :read, Redaction
       can [:create, :destroy], :session

-      can [:read, :data, :georss], Trace
+      can [:read, :data], Trace

       can [:read, :create, :suspended, :auth_success, :auth_failure], User
       can :read, UserBlock
     end
       can [:read, :create, :suspended, :auth_success, :auth_failure], User
       can :read, UserBlock
     end