diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-10-03 10:33:33 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-10-03 10:33:33 +0900 |
| commit | 41fe9edcf75a96db2f29c172828e6adf0ca5b0c9 (patch) | |
| tree | 905817422a31aafb8b4cc7981abaddf613f466e0 /db | |
| parent | e5e307dd75f74c5e98b039332c58170dc9c2735f (diff) | |
| parent | 42822a7d45f063804fe04f44e15cf04549460ae7 (diff) | |
| download | gitlab-ce-41fe9edcf75a96db2f29c172828e6adf0ca5b0c9.tar.gz | |
Merge branch 'master-ce' into scheduled-manual-jobs
Diffstat (limited to 'db')
| -rw-r--r-- | db/post_migrate/20180816193530_rename_login_root_namespaces.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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 |