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

diff --combined app/abilities/ability.rb
index 6dbeb0b64fe261e15ac6a82a8341049ebe80039d,51cc02925481541e02c3a9c25d519a8be422438f..9981f62ebc1c745a968bcb22ac890d21d7273f71
--- 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 [:index, :feed, :read, :download, :query], Changeset
      can :index, ChangesetComment
      can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id], :site
      can [:index, :rss, :show, :comments], DiaryEntry
@@@ -12,6 -11,7 +12,7 @@@
           :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder
      can [:index, :create, :comment, :feed, :show, :search, :mine], Note
      can [:index, :show], Redaction
+     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
  
@@@ -20,11 -20,11 +21,12 @@@
        can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
        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
  

diff --combined app/abilities/capability.rb
index fdc53891ae1385e3531de14e509d3d295e7adcf7,b6cad31158672178c4643654cd6fb2a40028318f..556d4036cd52714b79e563123460ae0576c993a4
--- 1/app/abilities/capability.rb
--- 2/app/abilities/capability.rb
+++ b/app/abilities/capability.rb
@@@ -5,13 -5,14 +5,15 @@@ class Capabilit
  
    def initialize(token)
      can [:create, :comment, :close, :reopen], Note if capability?(token, :allow_write_notes)
+     can [:api_read, :api_data], Trace if capability?(token, :allow_read_gpx)
+     can [:api_create, :api_update, :api_delete], Trace if capability?(token, :allow_write_gpx)
      can [:api_details], User if capability?(token, :allow_read_prefs)
      can [:api_gpx_files], User if capability?(token, :allow_read_gpx)
      can [:read, :read_one], UserPreference if capability?(token, :allow_read_prefs)
      can [:update, :update_one, :delete_one], UserPreference if capability?(token, :allow_write_prefs)
  
      if token&.user&.terms_agreed? || !REQUIRE_TERMS_AGREED
 +      can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset if capability?(token, :allow_write_api)
        can :create, ChangesetComment if capability?(token, :allow_write_api)
      end