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

[rails.git] / app / models / tracetag.rb

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index 8d2f4ffface4d307c0d1013ec212781010c8879d..f13f7269fbb73625c712bcd7804a254b59661c63 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -16,7 +16,7 @@
 #  gpx_file_tags_gpx_id_fkey  (gpx_id => gpx_files.id)
 #
 
 #  gpx_file_tags_gpx_id_fkey  (gpx_id => gpx_files.id)
 #
 

-class Tracetag < ActiveRecord::Base
+class Tracetag < ApplicationRecord

   self.table_name = "gpx_file_tags"
 
   belongs_to :trace, :foreign_key => "gpx_id"
   self.table_name = "gpx_file_tags"
 
   belongs_to :trace, :foreign_key => "gpx_id"