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

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

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index 54bc8fb4c4cbaddbbbbd9a3332b4d6789ef4aa88..9fc3cdd9cdb78fa659ef8234b6cae9483d3b64a5 100644 (file)
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@ -9,13 +9,12 @@ class ApiAbility
     can :index, :map
     can :show, :permission
     can [:search_all, :search_nodes, :search_ways, :search_relations], :search
-    can [:trackpoints], :swf
 
     if Settings.status != "database_offline"
       can [:show, :download, :query], Changeset
       can [:index, :create, :comment, :feed, :show, :search], Note
       can :index, Tracepoint
-      can [:api_users, :api_read], User
+      can [:index, :show], User
       can [:index, :show], Node
       can [:index, :show, :full, :ways_for_node], Way
       can [:index, :show, :full, :relations_for_node, :relations_for_way, :relations_for_relation], Relation
@@ -33,8 +32,8 @@ class ApiAbility
         can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
         can [:close, :reopen], Note
         can [:new, :create], Report
-        can [:api_create, :api_read, :api_update, :api_delete, :api_data], Trace
-        can [:api_details, :api_gpx_files], User
+        can [:create, :show, :update, :destroy, :data], Trace
+        can [:details, :gpx_files], User
         can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
 
         if user.terms_agreed?