summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelogs/unreleased/51782-fix_rename_login_namespace_migration.yml5
-rw-r--r--db/post_migrate/20180816193530_rename_login_root_namespaces.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/51782-fix_rename_login_namespace_migration.yml b/changelogs/unreleased/51782-fix_rename_login_namespace_migration.yml
new file mode 100644
index 00000000000..692edb5ded4
--- /dev/null
+++ b/changelogs/unreleased/51782-fix_rename_login_namespace_migration.yml
@@ -0,0 +1,5 @@
+---
+title: Fix migration to avoid an exception during upgrade
+merge_request: 22055
+author:
+type: fixed
diff --git a/db/post_migrate/20180816193530_rename_login_root_namespaces.rb b/db/post_migrate/20180816193530_rename_login_root_namespaces.rb
index b0c1fb98fa8..4ab1250473f 100644
--- a/db/post_migrate/20180816193530_rename_login_root_namespaces.rb
+++ b/db/post_migrate/20180816193530_rename_login_root_namespaces.rb
@@ -5,6 +5,8 @@ class RenameLoginRootNamespaces < ActiveRecord::Migration
DOWNTIME = false
+ disable_ddl_transaction!
+
# We're taking over the /login namespace as part of a fix for the Jira integration
def up
disable_statement_timeout do