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

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

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index e20b849d11d96991f494be946776cd9ede66987b..c790da66ab522f1b6fcbed3baee9cfa214b5b4f1 100644 (file)
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@ -10,7 +10,7 @@ class ApiAbility
     can :show, :version
 
     if Settings.status != "database_offline"
     can :show, :version
 
     if Settings.status != "database_offline"

-      can [:show, :download, :query], Changeset
+      can [:index, :show, :download], Changeset

       can [:index, :create, :feed, :show, :search], Note
       can :index, Tracepoint
       can [:index, :show], User
       can [:index, :create, :feed, :show, :search], Note
       can :index, Tracepoint
       can [:index, :show], User


@@ -22,7 +22,7 @@ class ApiAbility
 
       if user&.active?
         can [:comment, :close, :reopen], Note
 
       if user&.active?
         can [:comment, :close, :reopen], Note

-        can [:create, :show, :update, :destroy, :data], Trace
+        can [:create, :show, :update, :destroy], Trace

         can [:details, :gpx_files], User
         can [:index, :show, :update, :update_all, :destroy], UserPreference
 
         can [:details, :gpx_files], User
         can [:index, :show, :update, :update_all, :destroy], UserPreference