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 05f4952ac21907e0c1fbdcd869f94f134449f726..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


@@ -42,7 +42,7 @@ class Ability
         can [:create, :subscribe, :unsubscribe], DiaryEntry
         can :update, DiaryEntry, :user => user
         can [:create], DiaryComment
         can [:create, :subscribe, :unsubscribe], DiaryEntry
         can :update, DiaryEntry, :user => user
         can [:create], DiaryComment

-        can [:make_friend, :remove_friend], Friendship
+        can [:show, :create, :destroy], Follow

         can [:read, :create, :mark, :unmute, :destroy], Message
         can [:close, :reopen], Note
         can [:read, :update], :preference
         can [:read, :create, :mark, :unmute, :destroy], Message
         can [:close, :reopen], Note
         can [:read, :update], :preference


@@ -67,7 +67,8 @@ class Ability
           can [:hide, :unhide], [DiaryEntry, DiaryComment]
           can [:read, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:hide, :unhide], [DiaryEntry, DiaryComment]
           can [:read, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment

-          can [:set_status, :destroy], User
+
+          can [:update], :user_status

           can [:read, :update], :users_list
           can [:create, :destroy], UserRole
         end
           can [:read, :update], :users_list
           can [:create, :destroy], UserRole
         end