summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-06-21 15:12:07 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-06-21 15:12:07 +0000
commit0551364c60ff5f27ae10f5d0231bec8144332f5b (patch)
tree869d99318dd65580b45903bb57f69d77c67046e7
parent1e42253c6dd28f64d7a0f4227c60426c71db62bd (diff)
parent3ad076b7e98e36328729817664a5547966f39324 (diff)
downloadgitlab-ce-0551364c60ff5f27ae10f5d0231bec8144332f5b.tar.gz
Merge branch 'fix/gb/improve-autocancel-pipelines-migraton' into 'master'
Disable statement timeout in CI pipelines migration See merge request !12268
-rw-r--r--db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb b/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb
index 3c13a3d2518..765daa0a347 100644
--- a/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb
+++ b/db/post_migrate/20170502070007_enable_auto_cancel_pending_pipelines_for_all.rb
@@ -7,6 +7,8 @@ class EnableAutoCancelPendingPipelinesForAll < ActiveRecord::Migration
DOWNTIME = false
def up
+ disable_statement_timeout
+
update_column_in_batches(:projects, :auto_cancel_pending_pipelines, 1)
end