Add latest changes from gitlab-org/gitlab@master

2 files changed, 29 insertions, 0 deletions

diff --git a/db/migrate/20210223105256_remove_minergate_trigger_on_git_lab_com.rb b/db/migrate/20210223105256_remove_minergate_trigger_on_git_lab_com.rb
new file mode 100644
index 00000000000..b5f018efa59
--- /dev/null
+++ b/db/migrate/20210223105256_remove_minergate_trigger_on_git_lab_com.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class RemoveMinergateTriggerOnGitLabCom < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    return unless Gitlab.com?
+
+    with_lock_retries do
+      execute <<~SQL
+        DROP TRIGGER IF EXISTS ci_builds_block_minergate ON ci_builds;
+      SQL
+    end
+
+    execute <<~SQL
+      DROP FUNCTION IF EXISTS make_build_to_be_stuck_with_lock_version();
+      DROP FUNCTION IF EXISTS make_build_to_be_stuck();
+    SQL
+  end
+
+  def down
+    # no-op
+  end
+end
diff --git a/db/schema_migrations/20210223105256 b/db/schema_migrations/20210223105256
new file mode 100644
index 00000000000..cfee761bbc1
--- /dev/null
+++ b/db/schema_migrations/20210223105256
@@ -0,0 +1 @@
+5fa0e89f9d7715309f6fd9808a07c34bcca0d556a2a4a2841f419b3279db8759
\ No newline at end of file