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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index 9a8f193a1b5164ce1eea0e09cd583338729f6bd7..2214ba6210d58e32ec6e5925e05aabed0f5eee78 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -67,8 +67,9 @@ class Ability
           can [:hide, :unhide], [DiaryEntry, DiaryComment]
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:hide, :unhide], [DiaryEntry, DiaryComment]
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment

-          can [:set_status, :destroy, :index], User
-          can [:grant, :revoke], UserRole
+          can [:set_status, :destroy], User
+          can [:show, :update], :users_list
+          can [:create, :destroy], UserRole

         end
       end
     end
         end
       end
     end