diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-08-14 11:56:28 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-08-14 11:56:28 +0300 |
| commit | 2bb79b8eef40ef28a1fce64b1108bc05e0efafb0 (patch) | |
| tree | 92aa43625a74c3f4155c6f9ff70e7bb7c5a5e71e /db/post_migrate/20170711145558_migrate_stages_statuses.rb | |
| parent | d94fb81497f770b6ebb2e1b7fe1c5413eba5d481 (diff) | |
| parent | f21e655b61725b972ae80d584a66d6deb53a337d (diff) | |
Merge branch '48967-disable-statement-timeout' into 'master'
`disable_statement_timeout` will no longer leak to other migrations
Closes #48967
See merge request gitlab-org/gitlab-ce!20503
Diffstat (limited to 'db/post_migrate/20170711145558_migrate_stages_statuses.rb')
| -rw-r--r-- | db/post_migrate/20170711145558_migrate_stages_statuses.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/db/post_migrate/20170711145558_migrate_stages_statuses.rb b/db/post_migrate/20170711145558_migrate_stages_statuses.rb index 65755c0e824..265f7317b9b 100644 --- a/db/post_migrate/20170711145558_migrate_stages_statuses.rb +++ b/db/post_migrate/20170711145558_migrate_stages_statuses.rb @@ -26,9 +26,9 @@ class MigrateStagesStatuses < ActiveRecord::Migration end def down - disable_statement_timeout - - # rubocop:disable Migration/UpdateLargeTable - update_column_in_batches(:ci_stages, :status, nil) + disable_statement_timeout do + # rubocop:disable Migration/UpdateLargeTable + update_column_in_batches(:ci_stages, :status, nil) + end end end |