X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a790c47923ae5722743ba168eb79f3beabe8a71e..981e4a34b5d5ea1c1e3da1518697e2cf5e6ab0b3:/app/controllers/application_controller.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6c6a087b7..0411f75c4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -446,9 +446,9 @@ class ApplicationController < ActionController::Base end def current_ability - # Add in capabilities from the oauth token if it exists and is a valid access token + # Use capabilities from the oauth token if it exists and is a valid access token if Authenticator.new(self, [:token]).allow? - Ability.new(current_user).merge(Capability.new(current_token)) + Capability.new(current_token) else Ability.new(current_user) end