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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index d4172bfd16470ea9091123c72591161bd0dfcfca..adedce543e0f889ec519e07a378b26e40bd80a15 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -29,7 +29,7 @@ class Ability
 
     if user&.active?
       can :welcome, :site
 
     if user&.active?
       can :welcome, :site

-      can :read, [:deletion, :account_terms]
+      can :read, [:deletion, :account_terms, :account_pd_declaration]

 
       if Settings.status != "database_offline"
         can [:read, :create, :destroy], :changeset_subscription
 
       if Settings.status != "database_offline"
         can [:read, :create, :destroy], :changeset_subscription


@@ -38,12 +38,13 @@ class Ability
         can [:read, :create, :destroy], :oauth2_authorization
         can [:update, :destroy], :account
         can :update, :account_terms
         can [:read, :create, :destroy], :oauth2_authorization
         can [:update, :destroy], :account
         can :update, :account_terms

+        can :create, :account_pd_declaration

         can :read, :dashboard
         can [:create, :subscribe, :unsubscribe], DiaryEntry
         can :update, DiaryEntry, :user => user
         can [:create], DiaryComment
         can [:show, :create, :destroy], Follow
         can :read, :dashboard
         can [:create, :subscribe, :unsubscribe], DiaryEntry
         can :update, DiaryEntry, :user => user
         can [:create], DiaryComment
         can [:show, :create, :destroy], Follow

-        can [:read, :create, :mark, :unmute, :destroy], Message
+        can [:read, :create, :destroy], Message

         can [:close, :reopen], Note
         can [:read, :update], :preference
         can :update, :profile
         can [:close, :reopen], Note
         can [:read, :update], :preference
         can :update, :profile