[Rails5] Fix lib/tasks/tokens.rb and replace some ActiveRecord::Base recordsjprovazn-apprecord-test

13 files changed, 14 insertions, 13 deletions

diff --git a/app/models/concerns/atomic_internal_id.rb b/app/models/concerns/atomic_internal_id.rb
index 4e15b60ccd1..ab3d9e923c0 100644
--- a/app/models/concerns/atomic_internal_id.rb
+++ b/app/models/concerns/atomic_internal_id.rb
@@ -7,7 +7,7 @@
 #
 # For example, let's generate internal ids for Issue per Project:
 # ```
-# class Issue < ActiveRecord::Base
+# class Issue < ApplicationRecord
 #   has_internal_id :iid, scope: :project, init: ->(s) { s.project.issues.maximum(:iid) }
 # end
 # ```
diff --git a/app/models/concerns/ignorable_column.rb b/app/models/concerns/ignorable_column.rb
index 5c1f7dfcd2a..3bec44dc79b 100644
--- a/app/models/concerns/ignorable_column.rb
+++ b/app/models/concerns/ignorable_column.rb
@@ -5,7 +5,7 @@
 #
 # Example:
 #
-#     class User < ActiveRecord::Base
+#     class User < ApplicationRecord
 #       include IgnorableColumn
 #
 #       ignore_column :updated_at
diff --git a/app/models/concerns/participable.rb b/app/models/concerns/participable.rb
index 614c3242874..b140fca9b83 100644
--- a/app/models/concerns/participable.rb
+++ b/app/models/concerns/participable.rb
@@ -7,7 +7,7 @@
 #
 # Usage:
 #
-#     class Issue < ActiveRecord::Base
+#     class Issue < ApplicationRecord
 #       include Participable
 #
 #       # ...
diff --git a/app/models/concerns/reactive_caching.rb b/app/models/concerns/reactive_caching.rb
index d3572875fb3..650f94fad6c 100644
--- a/app/models/concerns/reactive_caching.rb
+++ b/app/models/concerns/reactive_caching.rb
@@ -7,7 +7,7 @@
 #
 # Example of use:
 #
-#    class Foo < ActiveRecord::Base
+#    class Foo < ApplicationRecord
 #      include ReactiveCaching
 #
 #      self.reactive_cache_key = ->(thing) { ["foo", thing.id] }
diff --git a/app/models/concerns/strip_attribute.rb b/app/models/concerns/strip_attribute.rb
index c9f5ba7793d..8f6a6244dd3 100644
--- a/app/models/concerns/strip_attribute.rb
+++ b/app/models/concerns/strip_attribute.rb
@@ -6,7 +6,7 @@
 #
 # Usage:
 #
-#     class Milestone < ActiveRecord::Base
+#     class Milestone < ApplicationRecord
 #       strip_attributes :title
 #     end
 #
diff --git a/app/validators/branch_filter_validator.rb b/app/validators/branch_filter_validator.rb
index 6a0899be850..cc37a3f0ba4 100644
--- a/app/validators/branch_filter_validator.rb
+++ b/app/validators/branch_filter_validator.rb
@@ -8,7 +8,7 @@
 #
 # Example:
 #
-#   class Webhook < ActiveRecord::Base
+#   class Webhook < ApplicationRecord
 #     validates :push_events_branch_filter, branch_name: true
 #   end
 #
diff --git a/app/validators/certificate_key_validator.rb b/app/validators/certificate_key_validator.rb
index 5b2bbffc066..8eab5a46dd4 100644
--- a/app/validators/certificate_key_validator.rb
+++ b/app/validators/certificate_key_validator.rb
@@ -4,7 +4,7 @@
 #
 # Custom validator for private keys.
 #
-#   class Project < ActiveRecord::Base
+#   class Project < ApplicationRecord
 #     validates :certificate_key, certificate_key: true
 #   end
 #
diff --git a/app/validators/certificate_validator.rb b/app/validators/certificate_validator.rb
index de8bb179dfb..8d92baba837 100644
--- a/app/validators/certificate_validator.rb
+++ b/app/validators/certificate_validator.rb
@@ -4,7 +4,7 @@
 #
 # Custom validator for private keys.
 #
-#   class Project < ActiveRecord::Base
+#   class Project < ApplicationRecord
 #     validates :certificate_key, certificate: true
 #   end
 #
diff --git a/app/validators/color_validator.rb b/app/validators/color_validator.rb
index 1932d042e83..63c73d0ffbb 100644
--- a/app/validators/color_validator.rb
+++ b/app/validators/color_validator.rb
@@ -7,7 +7,7 @@
 #
 # Example:
 #
-#   class User < ActiveRecord::Base
+#   class User < ApplicationRecord
 #     validates :background_color, allow_blank: true, color: true
 #   end
 #
diff --git a/app/validators/duration_validator.rb b/app/validators/duration_validator.rb
index 811828169ca..45e08d0ed47 100644
--- a/app/validators/duration_validator.rb
+++ b/app/validators/duration_validator.rb
@@ -6,7 +6,7 @@
 #
 # Example:
 #
-#   class ApplicationSetting < ActiveRecord::Base
+#   class ApplicationSetting < ApplicationRecord
 #     validates :default_artifacts_expire_in, presence: true, duration: true
 #   end
 #
diff --git a/app/validators/public_url_validator.rb b/app/validators/public_url_validator.rb
index 3ff880deedd..55c9c0ec413 100644
--- a/app/validators/public_url_validator.rb
+++ b/app/validators/public_url_validator.rb
@@ -9,7 +9,7 @@
 #
 # Example:
 #
-#   class User < ActiveRecord::Base
+#   class User < ApplicationRecord
 #     validates :personal_url, public_url: true
 #
 #     validates :ftp_url, public_url: { protocols: %w(ftp) }
diff --git a/app/validators/url_validator.rb b/app/validators/url_validator.rb
index 216acf79cbd..d4a0e0929c6 100644
--- a/app/validators/url_validator.rb
+++ b/app/validators/url_validator.rb
@@ -9,7 +9,7 @@
 #
 # Example:
 #
-#   class User < ActiveRecord::Base
+#   class User < ApplicationRecord
 #     validates :personal_url, url: true
 #
 #     validates :ftp_url, url: { protocols: %w(ftp) }
@@ -28,7 +28,7 @@
 # - enforce_user: Validate user format. Default: false
 #
 # Example:
-#   class User < ActiveRecord::Base
+#   class User < ApplicationRecord
 #     validates :personal_url, url: { allow_localhost: false, allow_local_network: false}
 #
 #     validates :web_url, url: { ports: [80, 443] }
diff --git a/lib/tasks/tokens.rake b/lib/tasks/tokens.rake
index efc44e05fd3..8ccddb99089 100644
--- a/lib/tasks/tokens.rake
+++ b/lib/tasks/tokens.rake
@@ -1,3 +1,4 @@
+require_relative "../../app/models/application_record.rb"
 require_relative '../../app/models/concerns/token_authenticatable.rb'
 require_relative '../../app/models/concerns/token_authenticatable_strategies/base.rb'
 require_relative '../../app/models/concerns/token_authenticatable_strategies/insecure.rb'