diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-02 19:25:18 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-02 19:25:18 +0300 |
| commit | c0a982fad665e28769967b17eddd90900f62be78 (patch) | |
| tree | d1fb9f9c14046f2da955249123bf3f9527ac98a5 | |
| parent | d4736a57bbc42c0872fb7f756d431bcd0c9bcae5 (diff) | |
| parent | 37d5a604381cc0df3b4aa830eb66a1ec67474fc1 (diff) | |
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
| -rw-r--r-- | changelogs/unreleased/51782-fix_rename_login_namespace_migration.yml | 5 | ||||
| -rw-r--r-- | db/post_migrate/20180816193530_rename_login_root_namespaces.rb | 2 |
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 |