summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-07-12 00:08:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-07-12 00:08:44 +0000
commit74ecce3c4f15fea535481c9c0232e2cf4eb6df93 (patch)
treef69f1f037e5e87a90b6c09196fe9a19a52ff3e0b
parente3a138e3b91d976bee17696df3fdb2708e9f2367 (diff)
downloadgitlab-ce-74ecce3c4f15fea535481c9c0232e2cf4eb6df93.tar.gz
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--db/migrate/20220708184822_cleanup_backfill_draft_status_on_merge_requests.rb15
-rw-r--r--db/schema_migrations/202207081848221
2 files changed, 16 insertions, 0 deletions
diff --git a/db/migrate/20220708184822_cleanup_backfill_draft_status_on_merge_requests.rb b/db/migrate/20220708184822_cleanup_backfill_draft_status_on_merge_requests.rb
new file mode 100644
index 00000000000..ffd5955a8b8
--- /dev/null
+++ b/db/migrate/20220708184822_cleanup_backfill_draft_status_on_merge_requests.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CleanupBackfillDraftStatusOnMergeRequests < Gitlab::Database::Migration[2.0]
+ disable_ddl_transaction!
+
+ MIGRATION = 'BackfillDraftStatusOnMergeRequests'
+
+ def up
+ finalize_background_migration(MIGRATION)
+ end
+
+ def down
+ # no-op
+ end
+end
diff --git a/db/schema_migrations/20220708184822 b/db/schema_migrations/20220708184822
new file mode 100644
index 00000000000..095ed891609
--- /dev/null
+++ b/db/schema_migrations/20220708184822
@@ -0,0 +1 @@
+80ac782e6e3ee1daec9e18f88a823d7cd43152a36f53c9d50758ba88a5711642 \ No newline at end of file