Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 0 insertions, 25 deletions

diff --git a/db/migrate/20200304160801_delete_template_services_duplicated_by_type.rb b/db/migrate/20200304160801_delete_template_services_duplicated_by_type.rb
deleted file mode 100644
index a1c5161aea0..00000000000
--- a/db/migrate/20200304160801_delete_template_services_duplicated_by_type.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class DeleteTemplateServicesDuplicatedByType < ActiveRecord::Migration[6.0]
-  DOWNTIME = false
-
-  def up
-    # Delete service templates with duplicated types. Keep the service
-    # template with the lowest `id` because that is the service template used:
-    # https://gitlab.com/gitlab-org/gitlab/-/blob/v12.8.1-ee/app/controllers/admin/services_controller.rb#L37
-    execute <<~SQL
-      DELETE
-      FROM services
-      WHERE TEMPLATE = TRUE
-        AND id NOT IN
-          (SELECT MIN(id)
-           FROM services
-           WHERE TEMPLATE = TRUE
-           GROUP BY TYPE);
-    SQL
-  end
-
-  def down
-    # This migration cannot be reversed.
-  end
-end