Fix rubocop warnings

diff --git a/db/migrate/005_tile_tracepoints.rb b/db/migrate/005_tile_tracepoints.rb
index 7c3bb8d1cbb1e0ef4c362f9b0fbec52b53b268a8..b46fdf25f4e7de0fcce8e7eff0f2ed78a355228e 100644 (file)
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -1,7 +1,7 @@
 require "migrate"
 
 class TileTracepoints < ActiveRecord::Migration[4.2]
-  class Tracepoint < ActiveRecord::Base
+  class Tracepoint < ApplicationRecord
     self.table_name = "gps_points"
   end
 

diff --git a/db/migrate/006_tile_nodes.rb b/db/migrate/006_tile_nodes.rb
index 848dc972418c5c762c6e97707abed2bcba4b44b4..ca898cb37b197f6f9c77ae386dc277a56d744973 100644 (file)
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -1,11 +1,11 @@
 require "migrate"
 
 class TileNodes < ActiveRecord::Migration[4.2]
-  class Node < ActiveRecord::Base
+  class Node < ApplicationRecord
     self.table_name = "current_nodes"
   end
 
-  class OldNode < ActiveRecord::Base
+  class OldNode < ApplicationRecord
     self.table_name = "nodes"
   end
 

diff --git a/db/migrate/008_remove_segments.rb b/db/migrate/008_remove_segments.rb
index 985a85820a1202a7a74d14165f2482fe915672af..f8a3085c6047b15b5cb06f24bf01115c1d03b7e7 100644 (file)
--- a/db/migrate/008_remove_segments.rb
+++ b/db/migrate/008_remove_segments.rb
@@ -14,8 +14,8 @@ class RemoveSegments < ActiveRecord::Migration[4.2]
           "#{src} -o #{cmd}") || raise
       end
 
-      conn_opts = ActiveRecord::Base.connection
-                                    .instance_eval { @connection_options }
+      conn_opts = ApplicationRecord.connection
+                                   .instance_eval { @connection_options }
       args = conn_opts.map(&:to_s) + [prefix]
       raise "#{cmd} failed" unless system cmd, *args
 

diff --git a/db/migrate/013_add_email_valid.rb b/db/migrate/013_add_email_valid.rb
index b6899f3300451de83e084101f0e349b4ab221d22..e4725b64345e9e56d3c01e2554ea86bb5ea224aa 100644 (file)
--- a/db/migrate/013_add_email_valid.rb
+++ b/db/migrate/013_add_email_valid.rb
@@ -1,5 +1,5 @@
 class AddEmailValid < ActiveRecord::Migration[4.2]
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
   end
 
   def self.up

diff --git a/db/migrate/020_populate_node_tags_and_remove.rb b/db/migrate/020_populate_node_tags_and_remove.rb
index caa3554191490ebfa33a14b6d6ac88269e380a20..fbb5d1af40f73c715ddd3d9a129ad37b6fc62c52 100644 (file)
--- a/db/migrate/020_populate_node_tags_and_remove.rb
+++ b/db/migrate/020_populate_node_tags_and_remove.rb
@@ -14,7 +14,7 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration[4.2]
           "#{src} -o #{cmd}") || raise
       end
 
-      conn_opts = ActiveRecord::Base.connection.instance_eval { @connection_options }
+      conn_opts = ApplicationRecord.connection.instance_eval { @connection_options }
       args = conn_opts.map(&:to_s) + [prefix]
       raise "#{cmd} failed" unless system cmd, *args
 

diff --git a/db/migrate/039_add_more_controls_to_gpx_files.rb b/db/migrate/039_add_more_controls_to_gpx_files.rb
index 6ce26588ea818337aa2fef5d9faa8d5a86102c84..2c3fee5be92ab9cb20d8a6496e529134c6dfa611 100644 (file)
--- a/db/migrate/039_add_more_controls_to_gpx_files.rb
+++ b/db/migrate/039_add_more_controls_to_gpx_files.rb
@@ -1,7 +1,7 @@
 require "migrate"
 
 class AddMoreControlsToGpxFiles < ActiveRecord::Migration[4.2]
-  class Trace < ActiveRecord::Base
+  class Trace < ApplicationRecord
     self.table_name = "gpx_files"
   end
 

diff --git a/db/migrate/044_create_user_roles.rb b/db/migrate/044_create_user_roles.rb
index 0098a0086a60d64c77c5bddcfd0149a0339199ca..0039859bfc2e27f4adb8ad50af7be2fefeae8329 100644 (file)
--- a/db/migrate/044_create_user_roles.rb
+++ b/db/migrate/044_create_user_roles.rb
@@ -1,10 +1,10 @@
 require "migrate"
 
 class CreateUserRoles < ActiveRecord::Migration[4.2]
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
   end
 
-  class UserRole < ActiveRecord::Base
+  class UserRole < ApplicationRecord
   end
 
   def self.up

diff --git a/db/migrate/046_alter_user_roles_and_blocks.rb b/db/migrate/046_alter_user_roles_and_blocks.rb
index cbd95018d97765100d758697d6023552fc024ce5..b10fcf144ea8ff7285423f2d99a6f63eda199b3b 100644 (file)
--- a/db/migrate/046_alter_user_roles_and_blocks.rb
+++ b/db/migrate/046_alter_user_roles_and_blocks.rb
@@ -1,7 +1,7 @@
 require "migrate"
 
 class AlterUserRolesAndBlocks < ActiveRecord::Migration[4.2]
-  class UserRole < ActiveRecord::Base
+  class UserRole < ApplicationRecord
   end
 
   def self.up

diff --git a/db/migrate/051_add_status_to_user.rb b/db/migrate/051_add_status_to_user.rb
index 5cf8a920f50e0f2e0d290bc32e91e85de4f1f1da..23761f24847c11dd970fa91c2cb6579cb7c2f57f 100644 (file)
--- a/db/migrate/051_add_status_to_user.rb
+++ b/db/migrate/051_add_status_to_user.rb
@@ -1,7 +1,7 @@
 require "migrate"
 
 class AddStatusToUser < ActiveRecord::Migration[4.2]
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
   end
 
   def self.up

diff --git a/db/migrate/20110322001319_add_terms_seen_to_user.rb b/db/migrate/20110322001319_add_terms_seen_to_user.rb
index f41782d37041e7ba562edd5f7c60ed97b457d09d..824eaceb06f346415473654fddf4a75ae56a113d 100644 (file)
--- a/db/migrate/20110322001319_add_terms_seen_to_user.rb
+++ b/db/migrate/20110322001319_add_terms_seen_to_user.rb
@@ -1,5 +1,5 @@
 class AddTermsSeenToUser < ActiveRecord::Migration[4.2]
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
   end
 
   def self.up

diff --git a/db/migrate/20120208122334_merge_acl_address_and_mask.rb b/db/migrate/20120208122334_merge_acl_address_and_mask.rb
index f05cb4f21416216a1d9f2af7a617dd323d3d43b7..09b0ae3b07c90f9869e04a418fb66897575ffbbb 100644 (file)
--- a/db/migrate/20120208122334_merge_acl_address_and_mask.rb
+++ b/db/migrate/20120208122334_merge_acl_address_and_mask.rb
@@ -11,7 +11,7 @@ class IPAddr
 end
 
 class MergeAclAddressAndMask < ActiveRecord::Migration[4.2]
-  class Acl < ActiveRecord::Base
+  class Acl < ApplicationRecord
   end
 
   def up

diff --git a/db/migrate/20120808231205_add_counter_caches.rb b/db/migrate/20120808231205_add_counter_caches.rb
index 330e2cea379586d93ea44ec26de1103058d90ea7..f29bfbb0e6e771900673e17edbf5fc9bc9257527 100644 (file)
--- a/db/migrate/20120808231205_add_counter_caches.rb
+++ b/db/migrate/20120808231205_add_counter_caches.rb
@@ -1,8 +1,8 @@
 class AddCounterCaches < ActiveRecord::Migration[4.2]
-  class Changeset < ActiveRecord::Base
+  class Changeset < ApplicationRecord
   end
 
-  class Trace < ActiveRecord::Base
+  class Trace < ApplicationRecord
     self.table_name = "gpx_files"
   end
 

diff --git a/db/migrate/20121005195010_add_diary_entry_counter_caches.rb b/db/migrate/20121005195010_add_diary_entry_counter_caches.rb
index b5e445400dc6a8b02d4b259fbb1d2d070dc0ccda..ec05f34646a4032bd5a77edee45e6716e3369721 100644 (file)
--- a/db/migrate/20121005195010_add_diary_entry_counter_caches.rb
+++ b/db/migrate/20121005195010_add_diary_entry_counter_caches.rb
@@ -1,8 +1,8 @@
 class AddDiaryEntryCounterCaches < ActiveRecord::Migration[4.2]
-  class DiaryEntry < ActiveRecord::Base
+  class DiaryEntry < ApplicationRecord
   end
 
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
   end
 
   def self.up

diff --git a/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb b/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb
index 9e9151a849a8430ca518122dc62a867c1fbbbea2..dd18b068d36fb9a6f3f75dc90b2a540abce6a241 100644 (file)
--- a/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb
+++ b/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb
@@ -1,5 +1,5 @@
 class AddImageUseGravatarToUsers < ActiveRecord::Migration[4.2]
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
   end
 
   def self.up

diff --git a/db/migrate/20150222101847_rename_openid_url.rb b/db/migrate/20150222101847_rename_openid_url.rb
index a12303812f65b8d5b1ad6de711d2afed3f00b658..06b399615124e8f535f0db3f8d3cfaf9c9bb4ef1 100644 (file)
--- a/db/migrate/20150222101847_rename_openid_url.rb
+++ b/db/migrate/20150222101847_rename_openid_url.rb
@@ -1,5 +1,5 @@
 class RenameOpenidUrl < ActiveRecord::Migration[4.2]
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
   end
 
   def change

diff --git a/db/migrate/20180204153242_tile_users.rb b/db/migrate/20180204153242_tile_users.rb
index 61dbcb4ea59fd63a69d0eaf6691a9462ad5328f7..917948d4317d942777d132b367adb4cab1601652 100644 (file)
--- a/db/migrate/20180204153242_tile_users.rb
+++ b/db/migrate/20180204153242_tile_users.rb
@@ -1,5 +1,5 @@
 class TileUsers < ActiveRecord::Migration[5.1]
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
   end
 
   def up