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

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

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index 7bbd9889ad53fbbb6d064b115f79eca7a54cad75..acacec049af1f20f6372c3a008945961fdda6c29 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 :read, ChangesetComment
       can :read, Tracepoint
       can :read, User
       can :read, [Node, Way, Relation, OldNode, OldWay, OldRelation]
@@ -43,7 +44,9 @@ class ApiAbility
 
           can :destroy, Note if scopes.include?("write_notes")
 
-          can :redact, [OldNode, OldWay, OldRelation] if user&.terms_agreed? && scopes.include?("write_redactions")
+          can :redact, [OldNode, OldWay, OldRelation] if user.terms_agreed? && scopes.include?("write_redactions")
+
+          can :create, UserBlock if scopes.include?("write_blocks")
         end
       end
     end