From d5e0416021aa6de53b89f9d415f368226d9326e5 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 22 Oct 2019 21:06:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/models/application_setting.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/models/application_setting.rb')

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index a07933d4975..4ecc9bc2153 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -104,6 +104,11 @@ class ApplicationSetting < ApplicationRecord
             hostname: 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 }
-- 
cgit v1.2.3