summaryrefslogtreecommitdiff
path: root/app/models/label.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-04 09:08:21 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-04 09:08:21 +0000
commiteada495948d07e4a1affffa1fa77bfd9730be1af (patch)
tree12473ea37a4602e06e54289711b8eb089efbf821 /app/models/label.rb
parentb41e09c9ce655d61557a3513508952240506b161 (diff)
downloadgitlab-ce-eada495948d07e4a1affffa1fa77bfd9730be1af.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/label.rb')
-rw-r--r--app/models/label.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/label.rb b/app/models/label.rb
index 1a07620f944..a46d6bc5c0f 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -9,10 +9,6 @@ class Label < ApplicationRecord
include Sortable
include FromUnion
include Presentable
- include IgnorableColumns
-
- # TODO: Project#create_labels can remove column exception when this column is dropped from all envs
- ignore_column :remove_on_close, remove_with: '14.1', remove_after: '2021-06-22'
cache_markdown_field :description, pipeline: :single_line