diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-12-27 12:48:23 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2016-12-27 16:53:42 +0000 |
| commit | 6a0bb6bfb3056c537c529c50b6d91d4d92b53ce4 (patch) | |
| tree | 07e92d98073c405baa90a98f48f8ff29f4e987ba | |
| parent | 0e7857fe68ee2e0919d314aefd47baeba41eee05 (diff) | |
| download | gitlab-ce-6a0bb6bfb3056c537c529c50b6d91d4d92b53ce4.tar.gz | |
Merge branch 'zj-disable-timeout-migration' into 'master'
Disable timeout while removing services
Closes #25976
See merge request !8322
| -rw-r--r-- | db/post_migrate/20161221140236_remove_unneeded_services.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/db/post_migrate/20161221140236_remove_unneeded_services.rb b/db/post_migrate/20161221140236_remove_unneeded_services.rb index a94ccc43a41..6b7e94c8641 100644 --- a/db/post_migrate/20161221140236_remove_unneeded_services.rb +++ b/db/post_migrate/20161221140236_remove_unneeded_services.rb @@ -4,6 +4,8 @@ class RemoveUnneededServices < ActiveRecord::Migration DOWNTIME = false def up + disable_statement_timeout + execute("DELETE FROM services WHERE active = false AND properties = '{}';") end |