Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 1 insertions, 7 deletions

diff --git a/db/migrate/20210507191949_add_remove_on_issue_close_to_labels.rb b/db/migrate/20210507191949_add_remove_on_issue_close_to_labels.rb
index 107388fe533..131edb20164 100644
--- a/db/migrate/20210507191949_add_remove_on_issue_close_to_labels.rb
+++ b/db/migrate/20210507191949_add_remove_on_issue_close_to_labels.rb
@@ -1,17 +1,11 @@
 # frozen_string_literal: true
 
 class AddRemoveOnIssueCloseToLabels < ActiveRecord::Migration[6.0]
-  include Gitlab::Database::MigrationHelpers
+  # This migration was reverted in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62056
 
   def up
-    with_lock_retries do
-      add_column :labels, :remove_on_close, :boolean, null: false, default: false
-    end
   end
 
   def down
-    with_lock_retries do
-      remove_column :labels, :remove_on_close, :boolean
-    end
   end
 end