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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index dcaa7e347a572f7040fdea42105f87255da96106..09e9be2cf2c7a92cb3b4afd64ceafa045487dff5 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -23,7 +23,9 @@ class Ability
 
     if user
       can :welcome, :site
+      can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
       can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
+      can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
       can [:close, :reopen], Note
       can [:new, :create], Report
       can [:mine, :new, :create, :edit, :update, :delete, :api_create, :api_read, :api_update, :api_delete, :api_data], Trace