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

diff --combined app/abilities/ability.rb
index 9609ee8bb28218517ca474666611a5bbd8a45dc8,a3700b305b18d1d57ed66bfa08e7ce18da0b1bd1..90f37793159d34a502602e8e7d6912ed46fd101d
--- 1/app/abilities/ability.rb
--- 2/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@@ -4,7 -4,6 +4,7 @@@ class Abilit
    include CanCan::Ability
  
    def initialize(user)
 +    can [:trackpoints, :map, :changes, :capabilities, :permissions], :api
      can [:relation, :relation_history, :way, :way_history, :node, :node_history,
           :changeset, :note, :new_note, :query], :browse
      can [:index, :feed, :read, :download, :query], Changeset
@@@ -16,18 -15,13 +16,19 @@@
      can [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
           :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder
      can [:index, :create, :comment, :feed, :show, :search, :mine], Note
+     can [:token, :request_token, :access_token, :test_request], :oauth
      can [:index, :show], Redaction
      can [:search_all, :search_nodes, :search_ways, :search_relations], :search
      can [:trackpoints], :swf
      can [:index, :show, :data, :georss, :picture, :icon], Trace
      can [:terms, :api_users, :login, :logout, :new, :create, :save, :confirm, :confirm_resend, :confirm_email, :lost_password, :reset_password, :show, :api_read, :auth_success, :auth_failure], User
      can [:index, :show, :blocks_on, :blocks_by], UserBlock
 +    can [:read, :nodes], Node
 +    can [:read, :full, :ways, :ways_for_node], Way
 +    can [:read, :full, :relations, :relations_for_node, :relations_for_way, :relations_for_relation], Relation
 +    can [:history, :version], OldNode
 +    can [:history, :version], OldWay
 +    can [:history, :version], OldRelation
  
      if user
        can :welcome, :site
@@@ -35,6 -29,7 +36,7 @@@
        can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
        can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
        can [:close, :reopen], Note
+       can [:revoke, :authorize], :oauth
        can [:new, :create], Report
        can [:mine, :new, :create, :edit, :update, :delete, :api_create, :api_read, :api_update, :api_delete, :api_data], Trace
        can [:account, :go_public, :make_friend, :remove_friend, :api_details, :api_gpx_files], User
@@@ -43,9 -38,6 +45,9 @@@
        if user.terms_agreed? || !REQUIRE_TERMS_AGREED
          can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset
          can :create, ChangesetComment
 +        can [:create, :update, :delete], Node
 +        can [:create, :update, :delete], Way
 +        can [:create, :update, :delete], Relation
        end
  
        if user.moderator?
@@@ -55,11 -47,6 +57,11 @@@
          can :destroy, Note
          can [:new, :create, :edit, :update, :destroy], Redaction
          can [:new, :edit, :create, :update, :revoke], UserBlock
 +        if user.terms_agreed? || !REQUIRE_TERMS_AGREED
 +          can :redact, OldNode
 +          can :redact, OldWay
 +          can :redact, OldRelation
 +        end
        end
  
        if user.administrator?