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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index 651dc497353260c720dfaecc9a1b0be588de408e..7f47b578cb5f9bffb2e8b5805f1a591c8acd2322 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -22,28 +22,29 @@ class Ability
       can [:create, :update], :password
       can :read, Redaction
       can [:create, :destroy], :session
       can [:create, :update], :password
       can :read, Redaction
       can [:create, :destroy], :session

-      can [:read, :data, :georss], Trace
+      can [:read, :data], Trace

       can [:read, :create, :suspended, :auth_success, :auth_failure], User
       can [:read, :create, :suspended, :auth_success, :auth_failure], User

-      can [:read, :update], :account_terms

       can :read, UserBlock
     end
 
     if user&.active?
       can :welcome, :site
       can :read, UserBlock
     end
 
     if user&.active?
       can :welcome, :site

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

 
       if Settings.status != "database_offline"
 
       if Settings.status != "database_offline"

-        can [:subscribe, :unsubscribe], Changeset
+        can [:read, :create, :destroy], :changeset_subscription

         can [:read, :create, :update, :destroy], :oauth2_application
         can [:read, :destroy], :oauth2_authorized_application
         can [:read, :create, :destroy], :oauth2_authorization
         can [:read, :create, :update, :destroy], :oauth2_application
         can [:read, :destroy], :oauth2_authorized_application
         can [:read, :create, :destroy], :oauth2_authorization

-        can [:update, :destroy], :account
+        can [:read, :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 :read, :dashboard
         can [:create, :subscribe, :unsubscribe], DiaryEntry
         can :update, DiaryEntry, :user => user
         can [:create], DiaryComment

-        can [:make_friend, :remove_friend], Friendship
-        can [:read, :create, :mark, :unmute, :destroy], Message
+        can [:show, :create, :destroy], Follow
+        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