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

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

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index ec4de8f8e03b99dc795f88cecf6421aefb11c00e..edf051faeb8f324b1a1767bbafeff07149dd222b 100644 (file)
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@ -11,6 +11,7 @@ class ApiAbility
       can :create, Note unless user
 
       can [:read, :download], Changeset
       can :create, Note unless user
 
       can [:read, :download], Changeset

+      can :read, ChangesetComment

       can :read, Tracepoint
       can :read, User
       can :read, [Node, Way, Relation, OldNode, OldWay, OldRelation]
       can :read, Tracepoint
       can :read, User
       can :read, [Node, Way, Relation, OldNode, OldWay, OldRelation]


@@ -43,7 +44,7 @@ class ApiAbility
 
           can :destroy, Note if scopes.include?("write_notes")
 
 
           can :destroy, Note if scopes.include?("write_notes")
 

-          can :redact, [OldNode, OldWay, OldRelation] if user.terms_agreed? && scopes.include?("write_redactions")
+          can [:create, :destroy], :element_version_redaction if user.terms_agreed? && scopes.include?("write_redactions")

 
           can :create, UserBlock if scopes.include?("write_blocks")
         end
 
           can :create, UserBlock if scopes.include?("write_blocks")
         end