From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Jan 2019 17:27:16 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2109'
X-Git-Tag: live~3328
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6c2432ae423c6744b8443c63d0e02e1ccc2d3011

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

6c2432ae423c6744b8443c63d0e02e1ccc2d3011
diff --cc app/abilities/ability.rb
index dcaa7e347,7138374f3..09e9be2cf
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@@ -23,10 -16,11 +23,12 @@@ class Abilit
  
      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
        can [:account, :go_public, :make_friend, :remove_friend, :api_details, :api_gpx_files], User
        can [:read, :read_one, :update, :update_one, :delete_one], UserPreference