diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 00:09:27 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 00:09:27 +0000 |
commit | 30a8d158a29cc09ece1a71771a28f7bc1483506b (patch) | |
tree | 223fab9858e274fff5e901116890d2d7c8ad162b /app/models | |
parent | ae93b284016c07a8a4b47e2510789253d14870f3 (diff) | |
download | gitlab-ce-30a8d158a29cc09ece1a71771a28f7bc1483506b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/namespace.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index 260ba9ea4a5..9e7589a1f18 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -11,6 +11,9 @@ class Namespace < ApplicationRecord include FeatureGate include FromUnion include Gitlab::Utils::StrongMemoize + include IgnorableColumns + + ignore_column :plan_id, remove_with: '13.1', remove_after: '2020-06-22' # Prevent users from creating unreasonably deep level of nesting. # The number 20 was taken based on maximum nesting level of |