From f5050253469fc0961c02deec0e698ad62bdd9de5 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 8 Apr 2020 09:09:43 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

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

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

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 9254f7dd633..c1e44748304 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -142,6 +142,9 @@ class ApplicationSetting < ApplicationRecord
 
   validates :default_artifacts_expire_in, presence: true, duration: true
 
+  validates :container_expiration_policies_enable_historic_entries,
+             inclusion: { in: [true, false], message: 'must be a boolean value' }
+
   validates :container_registry_token_expire_delay,
             presence: true,
             numericality: { only_integer: true, greater_than: 0 }
-- 
cgit v1.2.3