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

diff --combined app/abilities/ability.rb
index dcaa7e347a572f7040fdea42105f87255da96106,7138374f376692c37f26644c9b9bfe5731731210..09e9be2cf2c7a92cb3b4afd64ceafa045487dff5
--- 1/app/abilities/ability.rb
--- 2/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@@ -4,34 -4,27 +4,36 @@@ class Abilit
    include CanCan::Ability
  
    def initialize(user)
 +    can [:relation, :relation_history, :way, :way_history, :node, :node_history, :changeset, :note], :browse
 +    can [:index, :feed, :read, :download, :query], Changeset
      can :index, ChangesetComment
 +    can :search, :direction
      can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id], :site
      can [:index, :rss, :show, :comments], DiaryEntry
 +    can [:finish, :embed], :export
      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 [: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
  
      if user
        can :welcome, :site
+       can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
        can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
+       can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
        can [:close, :reopen], Note
        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
        can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
  
 -      if user.terms_agreed? || !REQUIRE_TERMS_AGREED # rubocop:disable Style/IfUnlessModifier
 +      if user.terms_agreed? || !REQUIRE_TERMS_AGREED
 +        can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset
          can :create, ChangesetComment
        end