From: Tom Hughes Date: Wed, 17 Jan 2024 18:32:08 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/4482' X-Git-Tag: live~372 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4eba549b5c0c2d01d0476ceaff894db6723177ee?hp=d5efa4c357c1f39181f9af96024eaacbb6bd328b Merge remote-tracking branch 'upstream/pull/4482' --- diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb index 4876380d0..0eae46f82 100644 --- a/app/abilities/api_ability.rb +++ b/app/abilities/api_ability.rb @@ -5,7 +5,6 @@ class ApiAbility def initialize(user) can :show, :capability - can :index, :change can :index, :map can :show, :permission can :show, :version @@ -22,17 +21,9 @@ class ApiAbility can [:history, :version], OldWay can [:history, :version], OldRelation can [:show], UserBlock - end - - if user&.active? - can :welcome, :site - can [:revoke, :authorize], :oauth - if Settings.status != "database_offline" - can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication - can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message + if user&.active? can [:comment, :close, :reopen], Note - can [:new, :create], Report can [:create, :show, :update, :destroy, :data], Trace can [:details, :gpx_files], User can [:index, :show, :update, :update_all, :destroy], UserPreference