Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-08-20 00:11:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-20 00:11:26 +0300
commitce5c259086445d71b405833c60ca71cd8c33de63 (patch)
treec55a1c0d32b328c5ba20dac33a3b01e8b649b654 /app/models/namespace_setting.rb
parentf5e42f97372d5bfe06291698d25e0f9e68b61819 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/namespace_setting.rb')
-rw-r--r--app/models/namespace_setting.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/namespace_setting.rb b/app/models/namespace_setting.rb
index 595e34821af..fa9b525d4fe 100644
--- a/app/models/namespace_setting.rb
+++ b/app/models/namespace_setting.rb
@@ -4,6 +4,11 @@ class NamespaceSetting < ApplicationRecord
include CascadingNamespaceSettingAttribute
include Sanitizable
include ChronicDurationAttribute
+ include IgnorableColumns
+
+ ignore_columns %i[exclude_from_free_user_cap include_for_free_user_cap_preview],
+ remove_with: '15.5',
+ remove_after: '2022-09-23'
cascading_attr :delayed_project_removal