Merge branch '331414-drop-labels-remove-on-close-column' into 'master'

Drop remove_on_close column from labels table in envs where it exists

See merge request gitlab-org/gitlab!62839

db/post_migrate/20210621164210_drop_remove_on_close_from_labels.rb

+# frozen_string_literal: true
+
+class DropRemoveOnCloseFromLabels < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  def up
+    # Migration that adds column was reverted, but run in Gitlab SaaS stg and prod
+    return unless column_exists?(:labels, :remove_on_close)
+
+    with_lock_retries do
+      remove_column :labels, :remove_on_close
+    end
+  end
+
+  def down
+    # No rollback as the original migration was reverted in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62056
+    # up simply removes the column from envs where the original migration was run
+  end
+end

db/schema_migrations/20210621164210

+b952f1e3fe2bfa680ba68b79637e0a2a1ee5b388cfa106db62521a663262b024
\ No newline at end of file