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 725ceccb2cc8a144d27a2bc5436608b8a6516426..2214ba6210d58e32ec6e5925e05aabed0f5eee78 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -67,7 +67,8 @@ 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 [:set_status, :destroy], User
+          can [:show, :update], :users_list

           can [:create, :destroy], UserRole
         end
       end
           can [:create, :destroy], UserRole
         end
       end