Merge branch '51782-fix_rename_login_namespace_migration' into 'master'

Resolve ""update_column_in_batches can not be run inside a transaction" during upgrade to 11.3"

Closes #51782

See merge request gitlab-org/gitlab-ce!22055
This commit is contained in:
Sean McGivern 2018-10-02 16:25:18 +00:00
commit c0a982fad6
2 changed files with 7 additions and 0 deletions

View File

@ -0,0 +1,5 @@
---
title: Fix migration to avoid an exception during upgrade
merge_request: 22055
author:
type: fixed

View File

@ -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