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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index 7f47b578cb5f9bffb2e8b5805f1a591c8acd2322..36f3b89dc355a6ce64203aa366c9daf7fca5b79c 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -4,7 +4,7 @@ class Ability
   include CanCan::Ability
 
   def initialize(user)
-    can :query, :browse
+    can :read, :feature_query
     can :read, [Node, Way, Relation, OldNode, OldWay, OldRelation]
     can [:show, :create], Note
     can :search, :direction
@@ -32,7 +32,7 @@ class Ability
       can :read, [:deletion, :account_terms, :account_pd_declaration, :account_home]
 
       if Settings.status != "database_offline"
-        can [:read, :create, :destroy], :changeset_subscription
+        can [:read, :create, :destroy], ChangesetSubscription
         can [:read, :create, :update, :destroy], :oauth2_application
         can [:read, :destroy], :oauth2_authorized_application
         can [:read, :create, :destroy], :oauth2_authorization