Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 5 deletions

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 6a34f293a4a..c037627570a 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -6,6 +6,12 @@ class ApplicationSetting < ApplicationRecord
   include TokenAuthenticatable
   include ChronicDurationAttribute
 
+  # Only remove this >= %12.6 and >= 2019-12-01
+  self.ignored_columns += %i[
+      pendo_enabled
+      pendo_url
+    ]
+
   add_authentication_token_field :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption, default_enabled: true) ? :optional : :required }
   add_authentication_token_field :health_check_access_token
   add_authentication_token_field :static_objects_external_storage_auth_token
@@ -103,11 +109,6 @@ class ApplicationSetting < ApplicationRecord
             allow_blank: true,
             if: :snowplow_enabled
 
-  validates :pendo_url,
-            presence: true,
-            public_url: true,
-            if: :pendo_enabled
-
   validates :max_attachment_size,
             presence: true,
             numericality: { only_integer: true, greater_than: 0 }