diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-06 22:13:43 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-06 22:13:43 +0300 |
| commit | a286e20d014e4092be7f03a2e1679f8f8434afa2 (patch) | |
| tree | 78ae0567e920a3893acb1e7abf72e12677a7c7bd /db | |
| parent | dd6604027411c407b675be52285b158fa9f0bf89 (diff) | |
| parent | 409322eb0ed6eed033e3b8624331c8e368cd2368 (diff) | |
Merge branch 'issue_50980' into 'master'
Disable statement timeout in RenameLoginRootNamespaces migration
Closes #50980
See merge request gitlab-org/gitlab-ce!21564
Diffstat (limited to 'db')
| -rw-r--r-- | db/post_migrate/20180816193530_rename_login_root_namespaces.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/db/post_migrate/20180816193530_rename_login_root_namespaces.rb b/db/post_migrate/20180816193530_rename_login_root_namespaces.rb index 60cec24eed6..b0c1fb98fa8 100644 --- a/db/post_migrate/20180816193530_rename_login_root_namespaces.rb +++ b/db/post_migrate/20180816193530_rename_login_root_namespaces.rb @@ -7,10 +7,14 @@ class RenameLoginRootNamespaces < ActiveRecord::Migration # We're taking over the /login namespace as part of a fix for the Jira integration def up - rename_root_paths 'login' + disable_statement_timeout do + rename_root_paths 'login' + end end def down - revert_renames + disable_statement_timeout do + revert_renames + end end end |