diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-02 16:25:18 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-10-03 10:08:57 +0200 |
| commit | eb1df283d4ec0974b0413d028fd3ec85a97075cb (patch) | |
| tree | b7164fa8e6e78d4ed01b9a1768fbf9bfd5fae867 | |
| parent | dc1f14ea39f2637835d0609177c709ca938a6123 (diff) | |
| download | gitlab-ce-eb1df283d4ec0974b0413d028fd3ec85a97075cb.tar.gz | |
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 |