From 37d5a604381cc0df3b4aa830eb66a1ec67474fc1 Mon Sep 17 00:00:00 2001
From: Mario de la Ossa <mdelaossa@gitlab.com>
Date: Tue, 2 Oct 2018 15:22:46 +0000
Subject: [PATCH] Fix rename_login_root_namespaces post migration

---
 .../51782-fix_rename_login_namespace_migration.yml           | 5 +++++
 .../20180816193530_rename_login_root_namespaces.rb           | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 changelogs/unreleased/51782-fix_rename_login_namespace_migration.yml

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